|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r68735 - trunk/libs/ratio/example
From: vicente.botet_at_[hidden]
Date: 2011-02-08 18:09:59
Author: viboes
Date: 2011-02-08 18:09:59 EST (Tue, 08 Feb 2011)
New Revision: 68735
URL: http://svn.boost.org/trac/boost/changeset/68735
Log:
Ratio/ try to solve vacpp compiler issue in si_physics example.
Text files modified:
trunk/libs/ratio/example/duration.hpp | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
Modified: trunk/libs/ratio/example/duration.hpp
==============================================================================
--- trunk/libs/ratio/example/duration.hpp (original)
+++ trunk/libs/ratio/example/duration.hpp 2011-02-08 18:09:59 EST (Tue, 08 Feb 2011)
@@ -47,7 +47,10 @@
#include <boost/type_traits/is_unsigned.hpp>
#include <boost/cstdint.hpp>
+#if (defined(BOOST_MSVC) && (BOOST_MSVC == 1500)) || defined(__IBMCPP__)
+#else
#include <boost/utility/enable_if.hpp>
+#endif
#include <boost/detail/workaround.hpp>
#include <boost/integer_traits.hpp>
@@ -458,7 +461,7 @@
duration() { } // = default;
template <class Rep2>
explicit duration(const Rep2& r
-#if defined(BOOST_MSVC) && (BOOST_MSVC == 1500)
+#if (defined(BOOST_MSVC) && (BOOST_MSVC == 1500)) || defined(__IBMCPP__)
#else
, typename boost::enable_if <
boost::mpl::and_ <
@@ -486,7 +489,7 @@
// conversions
template <class Rep2, class Period2>
duration(const duration<Rep2, Period2>& d
-#if defined(BOOST_MSVC) && (BOOST_MSVC == 1500)
+#if (defined(BOOST_MSVC) && (BOOST_MSVC == 1500)) || defined(__IBMCPP__)
#else
, typename boost::enable_if <
boost::mpl::or_ <
@@ -572,7 +575,7 @@
template <class Rep1, class Period, class Rep2>
inline
-#if defined(BOOST_MSVC) && (BOOST_MSVC == 1500)
+#if (defined(BOOST_MSVC) && (BOOST_MSVC == 1500)) || defined(__IBMCPP__)
duration<typename boost::common_type<Rep1, Rep2>::type, Period>
#else
typename boost::enable_if <
@@ -593,7 +596,7 @@
template <class Rep1, class Period, class Rep2>
inline
-#if defined(BOOST_MSVC) && (BOOST_MSVC == 1500)
+#if (defined(BOOST_MSVC) && (BOOST_MSVC == 1500)) || defined(__IBMCPP__)
duration<typename boost::common_type<Rep1, Rep2>::type, Period>
#else
typename boost::enable_if <
@@ -780,7 +783,7 @@
// Compile-time select the most efficient algorithm for the conversion...
template <class ToDuration, class Rep, class Period>
inline
-#if defined(BOOST_MSVC) && (BOOST_MSVC == 1500)
+#if (defined(BOOST_MSVC) && (BOOST_MSVC == 1500)) || defined(__IBMCPP__)
ToDuration
#else
typename boost::enable_if <boost_ex::chrono::detail::is_duration<ToDuration>, ToDuration>::type
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk