Mercurial > hg > vamp-build-and-test
diff DEPENDENCIES/generic/include/boost/geometry/strategies/side_info.hpp @ 101:c530137014c0
Update Boost headers (1.58.0)
| author | Chris Cannam |
|---|---|
| date | Mon, 07 Sep 2015 11:12:49 +0100 |
| parents | 2665513ce2d3 |
| children |
line wrap: on
line diff
--- a/DEPENDENCIES/generic/include/boost/geometry/strategies/side_info.hpp Fri Sep 04 12:01:02 2015 +0100 +++ b/DEPENDENCIES/generic/include/boost/geometry/strategies/side_info.hpp Mon Sep 07 11:12:49 2015 +0100 @@ -16,8 +16,9 @@ #include <cmath> #include <utility> -#ifdef BOOST_GEOMETRY_DEBUG_INTERSECTION -#include <iostream> + +#if defined(BOOST_GEOMETRY_DEBUG_INTERSECTION) || defined(BOOST_GEOMETRY_DEBUG_ROBUSTNESS) +# include <iostream> #endif namespace boost { namespace geometry @@ -25,8 +26,8 @@ // Silence warning C4127: conditional expression is constant #if defined(_MSC_VER) -#pragma warning(push) -#pragma warning(disable : 4127) +#pragma warning(push) +#pragma warning(disable : 4127) #endif /*! @@ -145,13 +146,13 @@ return sides[Which].first == 0 ? 0 : 1; } -#ifdef BOOST_GEOMETRY_DEBUG_INTERSECTION +#if defined(BOOST_GEOMETRY_DEBUG_INTERSECTION) || defined(BOOST_GEOMETRY_DEBUG_ROBUSTNESS) inline void debug() const { std::cout << sides[0].first << " " << sides[0].second << " " << sides[1].first << " " - << sides[1].second + << sides[1].second << std::endl; } #endif @@ -167,7 +168,7 @@ }; #if defined(_MSC_VER) -#pragma warning(pop) +#pragma warning(pop) #endif }} // namespace boost::geometry