Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

remove remnants of C-Style includes

Browse Source
This commit is contained in:
Dennis Luxen 2014-01-29 11:21:45 +01:00
parent b5170ed1fd
commit 4d132489c1
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
DataStructures/Coordinate.cpp
View File

@ -29,12 +29,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "../Util/StringUtil.h" #include "../Util/StringUtil.h"
#include <boost/assert.hpp> #include <boost/assert.hpp>
#include <cmath> #include <limits>
#include <climits>
FixedPointCoordinate::FixedPointCoordinate() FixedPointCoordinate::FixedPointCoordinate()
: lat(INT_MIN), : lat(std::numeric_limits<int>::min()),
lon(INT_MIN) lon(std::numeric_limits<int>::min())
{ } { }
FixedPointCoordinate::FixedPointCoordinate(int lat, int lon) FixedPointCoordinate::FixedPointCoordinate(int lat, int lon)
@ -43,11 +42,11 @@ FixedPointCoordinate::FixedPointCoordinate(int lat, int lon)
{ } { }
void FixedPointCoordinate::Reset() { void FixedPointCoordinate::Reset() {
lat = INT_MIN; lat = std::numeric_limits<int>::min();
lon = INT_MIN; lon = std::numeric_limits<int>::min();
} }
bool FixedPointCoordinate::isSet() const { bool FixedPointCoordinate::isSet() const {
return (INT_MIN != lat) && (INT_MIN != lon); return (std::numeric_limits<int>::min() != lat) && (std::numeric_limits<int>::min() != lon);
} }
bool FixedPointCoordinate::isValid() const { bool FixedPointCoordinate::isValid() const {
if( if(
@ -70,10 +69,10 @@ double FixedPointCoordinate::ApproximateDistance(
const int lat2, const int lat2,
const int lon2 const int lon2
) { ) {
BOOST_ASSERT(lat1 != INT_MIN); BOOST_ASSERT(lat1 != std::numeric_limits<int>::min());
BOOST_ASSERT(lon1 != INT_MIN); BOOST_ASSERT(lon1 != std::numeric_limits<int>::min());
BOOST_ASSERT(lat2 != INT_MIN); BOOST_ASSERT(lat2 != std::numeric_limits<int>::min());
BOOST_ASSERT(lon2 != INT_MIN); BOOST_ASSERT(lon2 != std::numeric_limits<int>::min());
double RAD = 0.017453292519943295769236907684886; double RAD = 0.017453292519943295769236907684886;
double lt1 = lat1/COORDINATE_PRECISION; double lt1 = lat1/COORDINATE_PRECISION;
double ln1 = lon1/COORDINATE_PRECISION; double ln1 = lon1/COORDINATE_PRECISION;
@ -108,10 +107,10 @@ double FixedPointCoordinate::ApproximateEuclideanDistance(
const FixedPointCoordinate &c1, const FixedPointCoordinate &c1,
const FixedPointCoordinate &c2 const FixedPointCoordinate &c2
) { ) {
BOOST_ASSERT(c1.lat != INT_MIN); BOOST_ASSERT(c1.lat != std::numeric_limits<int>::min());
BOOST_ASSERT(c1.lon != INT_MIN); BOOST_ASSERT(c1.lon != std::numeric_limits<int>::min());
BOOST_ASSERT(c2.lat != INT_MIN); BOOST_ASSERT(c2.lat != std::numeric_limits<int>::min());
BOOST_ASSERT(c2.lon != INT_MIN); BOOST_ASSERT(c2.lon != std::numeric_limits<int>::min());
const double RAD = 0.017453292519943295769236907684886; const double RAD = 0.017453292519943295769236907684886;
const double lat1 = (c1.lat/COORDINATE_PRECISION)*RAD; const double lat1 = (c1.lat/COORDINATE_PRECISION)*RAD;
const double lon1 = (c1.lon/COORDINATE_PRECISION)*RAD; const double lon1 = (c1.lon/COORDINATE_PRECISION)*RAD;