[test] Fix unused parameter warnings.

This commit is contained in:
Adam Wulkiewicz 2017-12-26 14:12:16 +01:00
parent 278acf8ed1
commit 3b80d1ae71
6 changed files with 28 additions and 13 deletions

View File

@ -2,6 +2,7 @@
// Unit Test // Unit Test
// Copyright (c) 2016 Barend Gehrels, Amsterdam, the Netherlands. // Copyright (c) 2016 Barend Gehrels, Amsterdam, the Netherlands.
// Copyright (c) 2017 Adam Wulkiewicz, Lodz, Poland.
// This file was modified by Oracle on 2017. // This file was modified by Oracle on 2017.
// Modifications copyright (c) 2017, Oracle and/or its affiliates. // Modifications copyright (c) 2017, Oracle and/or its affiliates.
@ -46,13 +47,13 @@ template
< <
bool Reverse1, bool Reverse2, bool Reverse1, bool Reverse2,
bg::overlay_type OverlayType, bg::overlay_type OverlayType,
typename Turns,
typename Clusters, typename Clusters,
typename Turns,
typename Geometry1, typename Geometry1,
typename Geometry2, typename Geometry2,
typename SideStrategy typename SideStrategy
> >
std::vector<std::size_t> test_gather_cluster_properties(std::string const& case_id, std::vector<std::size_t> gather_cluster_properties(
Clusters& clusters, Turns& turns, Clusters& clusters, Turns& turns,
bg::detail::overlay::operation_type for_operation, bg::detail::overlay::operation_type for_operation,
Geometry1 const& geometry1, Geometry2 const& geometry2, Geometry1 const& geometry1, Geometry2 const& geometry2,
@ -125,7 +126,7 @@ template
typename Geometry1, typename Geometry2, typename Geometry1, typename Geometry2,
typename RobustPolicy, typename Strategy typename RobustPolicy, typename Strategy
> >
std::vector<std::size_t> apply_overlay(std::string const& case_id, std::vector<std::size_t> apply_overlay(
Geometry1 const& geometry1, Geometry2 const& geometry2, Geometry1 const& geometry1, Geometry2 const& geometry2,
RobustPolicy const& robust_policy, RobustPolicy const& robust_policy,
Strategy const& strategy) Strategy const& strategy)
@ -165,7 +166,7 @@ std::vector<std::size_t> apply_overlay(std::string const& case_id,
side_strategy); side_strategy);
// Gather cluster properties, with test option // Gather cluster properties, with test option
return test_gather_cluster_properties<Reverse1, Reverse2, OverlayType>(case_id, return ::gather_cluster_properties<Reverse1, Reverse2, OverlayType>(
clusters, turns, bg::detail::overlay::operation_from_overlay<OverlayType>::value, clusters, turns, bg::detail::overlay::operation_from_overlay<OverlayType>::value,
geometry1, geometry2, strategy.get_side_strategy()); geometry1, geometry2, strategy.get_side_strategy());
} }
@ -206,8 +207,10 @@ void test_sort_by_side(std::string const& case_id,
strategy_type strategy; strategy_type strategy;
std::vector<std::size_t> result = apply_overlay<OverlayType, false, false, false, geometry_out>(case_id, g1, g2, std::vector<std::size_t> result = ::apply_overlay
robust_policy, strategy); <
OverlayType, false, false, false, geometry_out
>(g1, g2, robust_policy, strategy);
BOOST_CHECK_MESSAGE(result == expected_open_count, BOOST_CHECK_MESSAGE(result == expected_open_count,
" caseid=" << case_id " caseid=" << case_id

View File

@ -86,9 +86,9 @@ struct equal_turn
} }
template <typename P, typename R> template <typename P, typename R>
static bool equal_operations_ex(bg::detail::overlay::turn_operation<P, R> const& op0, static bool equal_operations_ex(bg::detail::overlay::turn_operation<P, R> const& /*op0*/,
bg::detail::overlay::turn_operation<P, R> const& op1, bg::detail::overlay::turn_operation<P, R> const& /*op1*/,
std::string const& s) std::string const& /*s*/)
{ {
return true; return true;
} }

View File

@ -1,6 +1,8 @@
// Boost.Geometry // Boost.Geometry
// Unit Test // Unit Test
// Copyright (c) 2017 Adam Wulkiewicz, Lodz, Poland.
// Copyright (c) 2017, Oracle and/or its affiliates. // Copyright (c) 2017, Oracle and/or its affiliates.
// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
@ -98,8 +100,8 @@ void test_geographic_one(std::string const& wkt1, std::string const& wkt2,
} }
else else
{ {
BOOST_CHECK_EQUAL(result_count, 0); BOOST_CHECK_EQUAL(result_count, 0u);
BOOST_CHECK_EQUAL(result_area, 0); BOOST_CHECK_EQUAL(result_area, 0.0);
} }
} }
} }

View File

@ -1,6 +1,8 @@
// Boost.Geometry (aka GGL, Generic Geometry Library) // Boost.Geometry (aka GGL, Generic Geometry Library)
// Unit Test // Unit Test
// Copyright (c) 2017 Adam Wulkiewicz, Lodz, Poland.
// Copyright (c) 2015 Oracle and/or its affiliates. // Copyright (c) 2015 Oracle and/or its affiliates.
// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
@ -26,12 +28,12 @@ struct assert_failure_exception
namespace boost { namespace geometry { namespace boost { namespace geometry {
inline void assertion_failed(char const * expr, char const * function, char const * file, long line) inline void assertion_failed(char const * /*expr*/, char const * /*function*/, char const * /*file*/, long /*line*/)
{ {
throw assert_failure_exception(); throw assert_failure_exception();
} }
inline void assertion_failed_msg(char const * expr, char const * msg, char const * function, char const * file, long line) inline void assertion_failed_msg(char const * /*expr*/, char const * /*msg*/, char const * /*function*/, char const * /*file*/, long /*line*/)
{ {
throw assert_failure_exception(); throw assert_failure_exception();
} }

View File

@ -1,6 +1,8 @@
// Boost.Geometry (aka GGL, Generic Geometry Library) // Boost.Geometry (aka GGL, Generic Geometry Library)
// Unit Test // Unit Test
// Copyright (c) 2017 Adam Wulkiewicz, Lodz, Poland.
// Copyright (c) 2014-2017, Oracle and/or its affiliates. // Copyright (c) 2014-2017, Oracle and/or its affiliates.
// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
@ -344,6 +346,8 @@ struct test_point_iterator_of_geometry
static inline void apply(Iterator first, Iterator last, static inline void apply(Iterator first, Iterator last,
G const& geometry) G const& geometry)
{ {
boost::ignore_unused(geometry);
std::reverse(first, last); std::reverse(first, last);
#ifdef BOOST_GEOMETRY_TEST_DEBUG #ifdef BOOST_GEOMETRY_TEST_DEBUG
print_point_range(std::cout, first, last, "reversed:\n") print_point_range(std::cout, first, last, "reversed:\n")

View File

@ -1,6 +1,8 @@
// Boost.Geometry (aka GGL, Generic Geometry Library) // Boost.Geometry (aka GGL, Generic Geometry Library)
// Unit Test // Unit Test
// Copyright (c) 2017 Adam Wulkiewicz, Lodz, Poland.
// Copyright (c) 2014, Oracle and/or its affiliates. // Copyright (c) 2014, Oracle and/or its affiliates.
// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
@ -169,6 +171,8 @@ struct test_segment_iterator_of_geometry
std::string const& header, std::string const& header,
bool check_num_segments) bool check_num_segments)
{ {
boost::ignore_unused(header);
typedef bg::segment_iterator<G const> segment_iterator; typedef bg::segment_iterator<G const> segment_iterator;
test_iterator_concepts<G const>(); test_iterator_concepts<G const>();