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

Subject: [Boost-commit] svn:boost r74684 - trunk/boost/chrono
From: vicente.botet_at_[hidden]
Date: 2011-10-04 01:39:50

Author: viboes
Date: 2011-10-04 01:39:45 EDT (Tue, 04 Oct 2011)
New Revision: 74684
URL: http://svn.boost.org/trac/boost/changeset/74684

Log:
Chrono: complete process_times common_type and make conversion Rep const
Text files modified: 
   trunk/boost/chrono/process_cpu_clocks.hpp |    11 ++++++++++-                             
   1 files changed, 10 insertions(+), 1 deletions(-)

Modified: trunk/boost/chrono/process_cpu_clocks.hpp
==============================================================================
--- trunk/boost/chrono/process_cpu_clocks.hpp	(original)
+++ trunk/boost/chrono/process_cpu_clocks.hpp	2011-10-04 01:39:45 EDT (Tue, 04 Oct 2011)
@@ -101,7 +101,7 @@
             rep   user;    // user cpu time
             rep system;  // system cpu time
 
-            operator rep()
+            operator rep() const
             {
               return real;
             }
@@ -211,6 +211,15 @@
   typedef chrono::process_times<typename common_type<Rep1, Rep2>::type> type;
 };
 
+template <class Rep1, class Rep2>
+struct common_type<
+  Rep1,
+  chrono::process_times<Rep2>
+>
+{
+  typedef chrono::process_times<typename common_type<Rep1, Rep2>::type> type;
+};
+
 
 namespace chrono
 {