Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes for miscellaneous gcc/clang warnings in the test suite. #1204

Merged
merged 1 commit into from
Dec 1, 2023
Merged

Fixes for miscellaneous gcc/clang warnings in the test suite. #1204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions include/boost/geometry/formulas/meridian_direct.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@ class meridian_direct
{
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;
}
Expand Down
2 changes: 1 addition & 1 deletion test/algorithms/buffer/buffer_linestring_geo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions test/algorithms/buffer/buffer_piece_border.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion test/algorithms/set_operations/intersection/intersection_integer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ void test_all()
}

template <typename CoordinateType>
void test_ticket_10868(std::string const& wkt_out)
void test_ticket_10868(/*std::string const& wkt_out*/)
{
using point_type = bg::model::point<CoordinateType, 2, bg::cs::cartesian>;
using polygon_type = bg::model::polygon
Expand Down
2 changes: 1 addition & 1 deletion test/algorithms/set_operations/union/union_issues.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<int>(boost::size(result)));
BOOST_CHECK_CLOSE(2.0, bg::area(result), 0.0001);
}

Expand Down
Loading