diff --git a/test/algorithms/overlay/sort_by_side.cpp b/test/algorithms/overlay/sort_by_side.cpp index b311dccc7..e836bef63 100644 --- a/test/algorithms/overlay/sort_by_side.cpp +++ b/test/algorithms/overlay/sort_by_side.cpp @@ -2,6 +2,7 @@ // Unit Test // Copyright (c) 2016 Barend Gehrels, Amsterdam, the Netherlands. +// Copyright (c) 2017 Adam Wulkiewicz, Lodz, Poland. // This file was modified by Oracle on 2017. // Modifications copyright (c) 2017, Oracle and/or its affiliates. @@ -46,13 +47,13 @@ template < bool Reverse1, bool Reverse2, bg::overlay_type OverlayType, - typename Turns, typename Clusters, + typename Turns, typename Geometry1, typename Geometry2, typename SideStrategy > -std::vector test_gather_cluster_properties(std::string const& case_id, +std::vector gather_cluster_properties( Clusters& clusters, Turns& turns, bg::detail::overlay::operation_type for_operation, Geometry1 const& geometry1, Geometry2 const& geometry2, @@ -125,7 +126,7 @@ template typename Geometry1, typename Geometry2, typename RobustPolicy, typename Strategy > -std::vector apply_overlay(std::string const& case_id, +std::vector apply_overlay( Geometry1 const& geometry1, Geometry2 const& geometry2, RobustPolicy const& robust_policy, Strategy const& strategy) @@ -165,7 +166,7 @@ std::vector apply_overlay(std::string const& case_id, side_strategy); // Gather cluster properties, with test option - return test_gather_cluster_properties(case_id, + return ::gather_cluster_properties( clusters, turns, bg::detail::overlay::operation_from_overlay::value, geometry1, geometry2, strategy.get_side_strategy()); } @@ -206,8 +207,10 @@ void test_sort_by_side(std::string const& case_id, strategy_type strategy; - std::vector result = apply_overlay(case_id, g1, g2, - robust_policy, strategy); + std::vector result = ::apply_overlay + < + OverlayType, false, false, false, geometry_out + >(g1, g2, robust_policy, strategy); BOOST_CHECK_MESSAGE(result == expected_open_count, " caseid=" << case_id diff --git a/test/algorithms/overlay/test_get_turns.hpp b/test/algorithms/overlay/test_get_turns.hpp index 8f93172d5..c9ef732dd 100644 --- a/test/algorithms/overlay/test_get_turns.hpp +++ b/test/algorithms/overlay/test_get_turns.hpp @@ -86,9 +86,9 @@ struct equal_turn } template - static bool equal_operations_ex(bg::detail::overlay::turn_operation const& op0, - bg::detail::overlay::turn_operation const& op1, - std::string const& s) + static bool equal_operations_ex(bg::detail::overlay::turn_operation const& /*op0*/, + bg::detail::overlay::turn_operation const& /*op1*/, + std::string const& /*s*/) { return true; } diff --git a/test/algorithms/set_operations/union/union_aa_geo.cpp b/test/algorithms/set_operations/union/union_aa_geo.cpp index 674d55dc2..8a004f7d4 100644 --- a/test/algorithms/set_operations/union/union_aa_geo.cpp +++ b/test/algorithms/set_operations/union/union_aa_geo.cpp @@ -1,6 +1,8 @@ // Boost.Geometry // Unit Test +// Copyright (c) 2017 Adam Wulkiewicz, Lodz, Poland. + // Copyright (c) 2017, Oracle and/or its affiliates. // 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 { - BOOST_CHECK_EQUAL(result_count, 0); - BOOST_CHECK_EQUAL(result_area, 0); + BOOST_CHECK_EQUAL(result_count, 0u); + BOOST_CHECK_EQUAL(result_area, 0.0); } } } diff --git a/test/core/assert.cpp b/test/core/assert.cpp index 3a36efd30..59d90dee1 100644 --- a/test/core/assert.cpp +++ b/test/core/assert.cpp @@ -1,6 +1,8 @@ // Boost.Geometry (aka GGL, Generic Geometry Library) // Unit Test +// Copyright (c) 2017 Adam Wulkiewicz, Lodz, Poland. + // Copyright (c) 2015 Oracle and/or its affiliates. // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle @@ -26,12 +28,12 @@ struct assert_failure_exception 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(); } -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(); } diff --git a/test/iterators/point_iterator.cpp b/test/iterators/point_iterator.cpp index f525640a8..346021420 100644 --- a/test/iterators/point_iterator.cpp +++ b/test/iterators/point_iterator.cpp @@ -1,6 +1,8 @@ // Boost.Geometry (aka GGL, Generic Geometry Library) // Unit Test +// Copyright (c) 2017 Adam Wulkiewicz, Lodz, Poland. + // Copyright (c) 2014-2017, Oracle and/or its affiliates. // 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, G const& geometry) { + boost::ignore_unused(geometry); + std::reverse(first, last); #ifdef BOOST_GEOMETRY_TEST_DEBUG print_point_range(std::cout, first, last, "reversed:\n") diff --git a/test/iterators/segment_iterator.cpp b/test/iterators/segment_iterator.cpp index bd3822175..79be776ae 100644 --- a/test/iterators/segment_iterator.cpp +++ b/test/iterators/segment_iterator.cpp @@ -1,6 +1,8 @@ // Boost.Geometry (aka GGL, Generic Geometry Library) // Unit Test +// Copyright (c) 2017 Adam Wulkiewicz, Lodz, Poland. + // Copyright (c) 2014, Oracle and/or its affiliates. // 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, bool check_num_segments) { + boost::ignore_unused(header); + typedef bg::segment_iterator segment_iterator; test_iterator_concepts();