From 2fa40785683d67dce70c7193df7544cb9c1fc140 Mon Sep 17 00:00:00 2001 From: Dmitry Marakasov Date: Wed, 9 Mar 2016 17:58:46 +0000 Subject: - Update to 3.0.9 - Fix LICENSE - Strip libraries - Respect CFLAGS/CXXFLAGS - Make proj optional - Switch to options helpers - Simplify docs installation PR: 207060 Submitted by: amdmi3 Approved by: maintainer timeout (littlesavage@rambler.ru, 3 weeks) --- .../patch-tests-cpp_tests-conversions_test.cpp | 79 ---------------------- 1 file changed, 79 deletions(-) delete mode 100644 graphics/mapnik/files/patch-tests-cpp_tests-conversions_test.cpp (limited to 'graphics/mapnik/files/patch-tests-cpp_tests-conversions_test.cpp') diff --git a/graphics/mapnik/files/patch-tests-cpp_tests-conversions_test.cpp b/graphics/mapnik/files/patch-tests-cpp_tests-conversions_test.cpp deleted file mode 100644 index 5bab40c4d79b..000000000000 --- a/graphics/mapnik/files/patch-tests-cpp_tests-conversions_test.cpp +++ /dev/null @@ -1,79 +0,0 @@ ---- tests/cpp_tests/conversions_test.cpp.orig 2013-06-30 22:35:29.000000000 +0400 -+++ tests/cpp_tests/conversions_test.cpp 2013-06-30 22:38:32.000000000 +0400 -@@ -166,31 +166,31 @@ - BOOST_TEST_EQ( out, "1e+09" ); - out.clear(); - -- to_string(out, double(10000000000)); -+ to_string(out, double(10000000000ULL)); - BOOST_TEST_EQ( out, "1e+10" ); - out.clear(); - -- to_string(out, double(100000000000)); -+ to_string(out, double(100000000000ULL)); - BOOST_TEST_EQ( out, "1e+11" ); - out.clear(); - -- to_string(out, double(1000000000000)); -+ to_string(out, double(1000000000000ULL)); - BOOST_TEST_EQ( out, "1e+12" ); - out.clear(); - -- to_string(out, double(10000000000000)); -+ to_string(out, double(10000000000000ULL)); - BOOST_TEST_EQ( out, "1e+13" ); - out.clear(); - -- to_string(out, double(100000000000000)); -+ to_string(out, double(100000000000000ULL)); - BOOST_TEST_EQ( out, "1e+14" ); - out.clear(); - -- to_string(out, double(1000000000000005)); -+ to_string(out, double(1000000000000005ULL)); - BOOST_TEST_EQ( out, "1e+15" ); - out.clear(); - -- to_string(out, double(-1000000000000000)); -+ to_string(out, double(-1000000000000000LL)); - BOOST_TEST_EQ( out, "-1e+15" ); - out.clear(); - -@@ -210,7 +210,7 @@ - BOOST_TEST_EQ( out, "67.35" ); - out.clear(); - -- to_string(out, double(1234000000000000)); -+ to_string(out, double(1234000000000000ULL)); - BOOST_TEST_EQ( out, "1.234e+15" ); - out.clear(); - -@@ -235,16 +235,16 @@ - BOOST_TEST_EQ( out, "-2" ); - out.clear(); - -- to_string(out, int(2147483647)); -+ to_string(out, int(2147483647ULL)); - BOOST_TEST_EQ( out, "2147483647" ); - out.clear(); - -- to_string(out, int(-2147483648)); -+ to_string(out, int(-2147483648LL)); - BOOST_TEST_EQ( out, "-2147483648" ); - out.clear(); - - // unsigned -- to_string(out, unsigned(4294967295)); -+ to_string(out, unsigned(4294967295ULL)); - BOOST_TEST_EQ( out, "4294967295" ); - out.clear(); - -@@ -258,7 +258,7 @@ - BOOST_TEST_EQ( out, "-2" ); - out.clear(); - -- to_string(out,mapnik::value_integer(9223372036854775807)); -+ to_string(out,mapnik::value_integer(9223372036854775807ULL)); - BOOST_TEST_EQ( out, "9223372036854775807" ); - out.clear(); - #else -- cgit v1.2.3