[Boost-commit] svn:boost r68569 - trunk/boost/chrono

Subject: [Boost-commit] svn:boost r68569 - trunk/boost/chrono
From: vicente.botet_at_[hidden]
Date: 2011-01-30 08:26:42

Author: viboes
Date: 2011-01-30 08:26:40 EST (Sun, 30 Jan 2011)
New Revision: 68569
URL: http://svn.boost.org/trac/boost/changeset/68569

Log:
Chrono: inhibit enable_if with msvc 9.0
Text files modified: 
   trunk/boost/chrono/duration.hpp   |     6 +++---                                  
   trunk/boost/chrono/time_point.hpp |    17 ++++-------------                       
   2 files changed, 7 insertions(+), 16 deletions(-)

Modified: trunk/boost/chrono/duration.hpp
==============================================================================
--- trunk/boost/chrono/duration.hpp	(original)
+++ trunk/boost/chrono/duration.hpp	2011-01-30 08:26:40 EST (Sun, 30 Jan 2011)
@@ -429,9 +429,9 @@
 
         BOOST_CHRONO_CONSTEXPR
         duration() { }
-#if defined(BOOST_MSVC) && (BOOST_MSVC == 1500)
-        duration(const rep& r) : rep_(r) { }
-#endif        
+//#if defined(BOOST_MSVCBOOST_MSVC) && (BOOST_MSVC == 1500)
+//        duration(const rep& r) : rep_(r) { }
+//#endif        
         template <class Rep2>
         BOOST_CHRONO_CONSTEXPR
         explicit duration(const Rep2& r,

Modified: trunk/boost/chrono/time_point.hpp
==============================================================================
--- trunk/boost/chrono/time_point.hpp	(original)
+++ trunk/boost/chrono/time_point.hpp	2011-01-30 08:26:40 EST (Sun, 30 Jan 2011)
@@ -167,25 +167,16 @@
         {}
 
         // conversions
-#if defined(BOOST_MSVC) && (BOOST_MSVC == 1500)
         template <class Duration2>
         BOOST_CHRONO_CONSTEXPR
-        explicit time_point(Duration2& d,
-                typename boost::enable_if
+        time_point(const time_point<clock, Duration2>& t
+#if defined(BOOST_MSVC) && (BOOST_MSVC == 1500)
+#else
+                , typename boost::enable_if
                 <
                     boost::is_convertible<Duration2, duration>
                 >::type* = 0)
-            : d_(d)
-        {
-        }
 #endif
-        template <class Duration2>
-        BOOST_CHRONO_CONSTEXPR
-        time_point(const time_point<clock, Duration2>& t,
-                typename boost::enable_if
-                <
-                    boost::is_convertible<Duration2, duration>
-                >::type* = 0)
             : d_(t.time_since_epoch())
         {
         }