boost/geometry
2
0
Fork 0
mirror of https://github.com/boostorg/geometry.git synced 2026-02-02 21:02:13 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'bg-prepare'

Browse Source
This commit is contained in:
Barend Gehrels
2015-03-30 18:25:04 +02:00
parent 447f729589 714d01a1ea
commit bd9455207b
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/boost/geometry/util/promote_integral.hpp
View File

@@ -165,7 +165,8 @@ struct promote_to_larger<T, EndIterator, EndIterator, MinSize>
considered only if the macro BOOST_HAS_LONG_LONG is defined
\note boost::int128_type and boost::uint128_type are considered
only if the macro BOOST_HAS_INT128 is defined
only if the macros BOOST_HAS_INT128 and BOOST_GEOMETRY_ENABLE_INT128
are defined
*/
template
<
@@ -248,7 +249,7 @@ private:
#if defined(BOOST_HAS_LONG_LONG)
, boost::long_long_type
#endif
#if defined(BOOST_HAS_INT128)
#if defined(BOOST_HAS_INT128) && defined(BOOST_GEOMETRY_ENABLE_INT128)
, boost::int128_type
#endif
#if !defined(BOOST_GEOMETRY_NO_MULTIPRECISION_INTEGER)
@@ -268,7 +269,7 @@ private:
#if defined(BOOST_HAS_LONG_LONG)
, boost::ulong_long_type
#endif
#if defined(BOOST_HAS_INT128)
#if defined(BOOST_HAS_INT128) && defined(BOOST_GEOMETRY_ENABLE_INT128)
, boost::uint128_type
#endif
#if !defined(BOOST_GEOMETRY_NO_MULTIPRECISION_INTEGER)

13
test/util/promote_integral.cpp
View File

@@ -35,7 +35,8 @@
#include <boost/multiprecision/cpp_int.hpp>
#endif
#if defined(BOOST_GEOMETRY_TEST_DEBUG) && defined(BOOST_HAS_INT128)
#if defined(BOOST_GEOMETRY_TEST_DEBUG)
#if defined(BOOST_HAS_INT128) && defined(BOOST_GEOMETRY_ENABLE_INT128)
void print_uint128_t(std::ostream& os, boost::uint128_type i)
{
if (i == 0)
@@ -74,8 +75,8 @@ std::ostream& operator<<(std::ostream& os, boost::uint128_type i)
print_uint128_t(os, i);
return os;
}
#endif
#endif // BOOST_HAS_INT128 && BOOST_GEOMETRY_ENABLE_INT128
#endif // BOOST_GEOMETRY_TEST_DEBUG
namespace bg = boost::geometry;
@@ -296,7 +297,7 @@ struct test_promotion
tester::template apply<T, boost::long_long_type>(case_id);
}
#endif
#if defined(BOOST_HAS_INT128)
#if defined(BOOST_HAS_INT128) && defined(BOOST_GEOMETRY_ENABLE_INT128)
else if (bit_size<boost::int128_type>() >= min_size)
{
tester::template apply<T, boost::int128_type>(case_id);
@@ -366,7 +367,7 @@ struct test_promotion<T, true, false>
tester::template apply<T, boost::ulong_long_type>(case_id);
}
#endif
#if defined(BOOST_HAS_INT128)
#if defined(BOOST_HAS_INT128) && defined(BOOST_GEOMETRY_ENABLE_INT128)
else if (bit_size<boost::uint128_type>() >= min_size)
{
tester::template apply<T, boost::uint128_type>(case_id);
@@ -448,7 +449,7 @@ BOOST_AUTO_TEST_CASE( test_long_long )
}
#endif
#if defined(BOOST_HAS_INT128)
#if defined(BOOST_HAS_INT128) && defined(BOOST_GEOMETRY_ENABLE_INT128)
BOOST_AUTO_TEST_CASE( test_int128 )
{
test_promotion<boost::int128_type>::apply("int128_t");