mirror of
https://github.com/boostorg/ratio.git
synced 2025-05-11 21:44:03 +00:00
Ratio/ try to solve vacpp compiler issue in si_physics example.
[SVN r68735]
This commit is contained in:
parent
00a6ea5b10
commit
53aa5dbfb0
@ -47,7 +47,10 @@ time2_demo contained this comment:
|
|||||||
#include <boost/type_traits/is_unsigned.hpp>
|
#include <boost/type_traits/is_unsigned.hpp>
|
||||||
|
|
||||||
#include <boost/cstdint.hpp>
|
#include <boost/cstdint.hpp>
|
||||||
|
#if (defined(BOOST_MSVC) && (BOOST_MSVC == 1500)) || defined(__IBMCPP__)
|
||||||
|
#else
|
||||||
#include <boost/utility/enable_if.hpp>
|
#include <boost/utility/enable_if.hpp>
|
||||||
|
#endif
|
||||||
#include <boost/detail/workaround.hpp>
|
#include <boost/detail/workaround.hpp>
|
||||||
#include <boost/integer_traits.hpp>
|
#include <boost/integer_traits.hpp>
|
||||||
|
|
||||||
@ -458,7 +461,7 @@ namespace chrono {
|
|||||||
duration() { } // = default;
|
duration() { } // = default;
|
||||||
template <class Rep2>
|
template <class Rep2>
|
||||||
explicit duration(const Rep2& r
|
explicit duration(const Rep2& r
|
||||||
#if defined(BOOST_MSVC) && (BOOST_MSVC == 1500)
|
#if (defined(BOOST_MSVC) && (BOOST_MSVC == 1500)) || defined(__IBMCPP__)
|
||||||
#else
|
#else
|
||||||
, typename boost::enable_if <
|
, typename boost::enable_if <
|
||||||
boost::mpl::and_ <
|
boost::mpl::and_ <
|
||||||
@ -486,7 +489,7 @@ namespace chrono {
|
|||||||
// conversions
|
// conversions
|
||||||
template <class Rep2, class Period2>
|
template <class Rep2, class Period2>
|
||||||
duration(const duration<Rep2, Period2>& d
|
duration(const duration<Rep2, Period2>& d
|
||||||
#if defined(BOOST_MSVC) && (BOOST_MSVC == 1500)
|
#if (defined(BOOST_MSVC) && (BOOST_MSVC == 1500)) || defined(__IBMCPP__)
|
||||||
#else
|
#else
|
||||||
, typename boost::enable_if <
|
, typename boost::enable_if <
|
||||||
boost::mpl::or_ <
|
boost::mpl::or_ <
|
||||||
@ -572,7 +575,7 @@ namespace chrono {
|
|||||||
|
|
||||||
template <class Rep1, class Period, class Rep2>
|
template <class Rep1, class Period, class Rep2>
|
||||||
inline
|
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>
|
duration<typename boost::common_type<Rep1, Rep2>::type, Period>
|
||||||
#else
|
#else
|
||||||
typename boost::enable_if <
|
typename boost::enable_if <
|
||||||
@ -593,7 +596,7 @@ typename boost::enable_if <
|
|||||||
|
|
||||||
template <class Rep1, class Period, class Rep2>
|
template <class Rep1, class Period, class Rep2>
|
||||||
inline
|
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>
|
duration<typename boost::common_type<Rep1, Rep2>::type, Period>
|
||||||
#else
|
#else
|
||||||
typename boost::enable_if <
|
typename boost::enable_if <
|
||||||
@ -780,7 +783,7 @@ typename boost::enable_if <
|
|||||||
// Compile-time select the most efficient algorithm for the conversion...
|
// Compile-time select the most efficient algorithm for the conversion...
|
||||||
template <class ToDuration, class Rep, class Period>
|
template <class ToDuration, class Rep, class Period>
|
||||||
inline
|
inline
|
||||||
#if defined(BOOST_MSVC) && (BOOST_MSVC == 1500)
|
#if (defined(BOOST_MSVC) && (BOOST_MSVC == 1500)) || defined(__IBMCPP__)
|
||||||
ToDuration
|
ToDuration
|
||||||
#else
|
#else
|
||||||
typename boost::enable_if <boost_ex::chrono::detail::is_duration<ToDuration>, ToDuration>::type
|
typename boost::enable_if <boost_ex::chrono::detail::is_duration<ToDuration>, ToDuration>::type
|
||||||
|
Loading…
x
Reference in New Issue
Block a user