diff --git a/include/boost/geometry/formulas/meridian_direct.hpp b/include/boost/geometry/formulas/meridian_direct.hpp index 330af6703..3699e4c7c 100644 --- a/include/boost/geometry/formulas/meridian_direct.hpp +++ b/include/boost/geometry/formulas/meridian_direct.hpp @@ -84,8 +84,8 @@ public: { result.reverse_azimuth = pi; } - else if (result.lat2 < -half_pi && - result.lat2 > -one_and_a_half_pi) + else if (result.lat2 > -one_and_a_half_pi && + result.lat2 < -half_pi) { result.reverse_azimuth = c0; } diff --git a/test/algorithms/buffer/buffer_linestring_geo.cpp b/test/algorithms/buffer/buffer_linestring_geo.cpp index 68fe9f2c0..eae435730 100644 --- a/test/algorithms/buffer/buffer_linestring_geo.cpp +++ b/test/algorithms/buffer/buffer_linestring_geo.cpp @@ -71,7 +71,7 @@ void test_linestring() } settings.test_area = false; - auto const n = sizeof(testcases_aimes) / sizeof(testcases_aimes[0]); + int const n = sizeof(testcases_aimes) / sizeof(testcases_aimes[0]); // Cases (ouf of 197) where the guessed area estimations are not met. // If this needs to be changed, be sure to diff --git a/test/algorithms/buffer/buffer_piece_border.cpp b/test/algorithms/buffer/buffer_piece_border.cpp index 0baeb773f..b3ce0a278 100644 --- a/test/algorithms/buffer/buffer_piece_border.cpp +++ b/test/algorithms/buffer/buffer_piece_border.cpp @@ -161,10 +161,10 @@ void test_point(std::string const& wkt, bool expected_outside, Point point; bg::read_wkt(wkt, point); border.point_on_piece(point, false, false, state); - BOOST_CHECK(expected_outside == state.count > 0); - BOOST_CHECK(expected_on_offsetted == state.count_on_offsetted > 0); - BOOST_CHECK(expected_on_edge == state.count_on_edge > 0); - BOOST_CHECK(expected_on_origin == state.count_on_origin > 0); + BOOST_CHECK(expected_outside == (state.count > 0)); + BOOST_CHECK(expected_on_offsetted == (state.count_on_offsetted > 0)); + BOOST_CHECK(expected_on_edge == (state.count_on_edge > 0)); + BOOST_CHECK(expected_on_origin == (state.count_on_origin > 0)); #ifdef TEST_WITH_SVG std::string style = "fill:" + color + ";stroke:rgb(0,0,0);stroke-width:1"; diff --git a/test/algorithms/set_operations/intersection/intersection_integer.cpp b/test/algorithms/set_operations/intersection/intersection_integer.cpp index e5b8270fc..9bd948e3f 100644 --- a/test/algorithms/set_operations/intersection/intersection_integer.cpp +++ b/test/algorithms/set_operations/intersection/intersection_integer.cpp @@ -64,7 +64,7 @@ void test_all() } template -void test_ticket_10868(std::string const& wkt_out) +void test_ticket_10868(/*std::string const& wkt_out*/) { using point_type = bg::model::point; using polygon_type = bg::model::polygon diff --git a/test/algorithms/set_operations/union/union_issues.cpp b/test/algorithms/set_operations/union/union_issues.cpp index b09ccc874..2346c1fcb 100644 --- a/test/algorithms/set_operations/union/union_issues.cpp +++ b/test/algorithms/set_operations/union/union_issues.cpp @@ -43,7 +43,7 @@ void issue_1103() bg::union_(poly1, poly2, result); // Verify result. Before commit b1bebca the result was empty. - BOOST_CHECK_EQUAL(1, boost::size(result)); + BOOST_CHECK_EQUAL(1, static_cast(boost::size(result))); BOOST_CHECK_CLOSE(2.0, bg::area(result), 0.0001); }