[Boost-commit] svn:boost r74445 - trunk/boost/chrono/detail/inlined/mac

Subject: [Boost-commit] svn:boost r74445 - trunk/boost/chrono/detail/inlined/mac
From: vicente.botet_at_[hidden]
Date: 2011-09-18 04:42:34

Author: viboes
Date: 2011-09-18 04:42:33 EDT (Sun, 18 Sep 2011)
New Revision: 74445
URL: http://svn.boost.org/trac/boost/changeset/74445

Log:
Chrono: Fix typo on Mac while adding noexceptl
Text files modified: 
   trunk/boost/chrono/detail/inlined/mac/process_cpu_clocks.hpp |    44 ++++++++++++++++++++--------------------
   1 files changed, 22 insertions(+), 22 deletions(-)

Modified: trunk/boost/chrono/detail/inlined/mac/process_cpu_clocks.hpp
==============================================================================
--- trunk/boost/chrono/detail/inlined/mac/process_cpu_clocks.hpp	(original)
+++ trunk/boost/chrono/detail/inlined/mac/process_cpu_clocks.hpp	2011-09-18 04:42:33 EDT (Sun, 18 Sep 2011)
@@ -117,28 +117,6 @@
     }
 }
 
-process_real_cpu_clock::time_point process_real_cpu_clock::now() BOOST_CHRONO_NOEXCEPT
-{
-    tms tm;
-    clock_t c = ::times( &tm );
-    if ( c == clock_t(-1) ) // error
-    {
-      BOOST_ASSERT(0 && "Boost::Chrono - Internal Error");
-    }
-    else
-    {
-        if ( chrono_detail::tick_factor() != -1 )
-        {
-            return time_point(
-                    microseconds(c)*chrono_detail::tick_factor());
-        }
-        else
-        {
-          BOOST_ASSERT(0 && "Boost::Chrono - Internal Error");
-        }
-    }
-    return time_point();
-}
 
 process_user_cpu_clock::time_point process_user_cpu_clock::now(
         system::error_code & ec)
@@ -191,6 +169,28 @@
     }
 }
 
+process_user_cpu_clock::time_point process_user_cpu_clock::now() BOOST_CHRONO_NOEXCEPT
+{
+    tms tm;
+    clock_t c = ::times( &tm );
+    if ( c == clock_t(-1) ) // error
+    {
+      BOOST_ASSERT(0 && "Boost::Chrono - Internal Error");
+    }
+    else
+    {
+        if ( chrono_detail::tick_factor() != -1 )
+        {
+          return time_point(
+                  microseconds(tm.tms_utime + tm.tms_cutime)*chrono_detail::tick_factor());
+        }
+        else
+        {
+          BOOST_ASSERT(0 && "Boost::Chrono - Internal Error");
+        }
+    }
+    return time_point();
+}
 process_system_cpu_clock::time_point process_system_cpu_clock::now() BOOST_CHRONO_NOEXCEPT
 {
     tms tm;