Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r75435 - in trunk/boost/chrono: . io
From: vicente.botet_at_[hidden]
Date: 2011-11-10 12:10:36


Author: viboes
Date: 2011-11-10 12:10:31 EST (Thu, 10 Nov 2011)
New Revision: 75435
URL: http://svn.boost.org/trac/boost/changeset/75435

Log:
Chrono: FIxed issue with commented BOOST_CHRONO_HAS_PROCESS_CLOCKS in io/time_point_units.hpp
Text files modified:
   trunk/boost/chrono/config.hpp | 1 +
   trunk/boost/chrono/io/duration_io.hpp | 2 +-
   trunk/boost/chrono/io/duration_style.hpp | 2 +-
   trunk/boost/chrono/io/ios_base_state.hpp | 2 +-
   trunk/boost/chrono/io/time_point_units.hpp | 8 ++++----
   5 files changed, 8 insertions(+), 7 deletions(-)

Modified: trunk/boost/chrono/config.hpp
==============================================================================
--- trunk/boost/chrono/config.hpp (original)
+++ trunk/boost/chrono/config.hpp 2011-11-10 12:10:31 EST (Thu, 10 Nov 2011)
@@ -88,6 +88,7 @@
 #undef BOOST_CHRONO_THREAD_CLOCK_IS_STEADY
 #endif
 
+//#undef BOOST_CHRONO_HAS_PROCESS_CLOCKS
 // deprecated i/o
 //#define BOOST_CHRONO_DONT_PROVIDE_DEPRECATED_IO_V1
 

Modified: trunk/boost/chrono/io/duration_io.hpp
==============================================================================
--- trunk/boost/chrono/io/duration_io.hpp (original)
+++ trunk/boost/chrono/io/duration_io.hpp 2011-11-10 12:10:31 EST (Thu, 10 Nov 2011)
@@ -1,7 +1,7 @@
 // chrono_io
 //
 // (C) Copyright Howard Hinnant
-// (C) Copyright 2010-2011 Vicente J. Botet Escriba
+// (C) Copyright 2011 Vicente J. Botet Escriba
 // Use, modification and distribution are subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt).

Modified: trunk/boost/chrono/io/duration_style.hpp
==============================================================================
--- trunk/boost/chrono/io/duration_style.hpp (original)
+++ trunk/boost/chrono/io/duration_style.hpp 2011-11-10 12:10:31 EST (Thu, 10 Nov 2011)
@@ -1,7 +1,7 @@
 // chrono_io
 //
 // (C) Copyright Howard Hinnant
-// (C) Copyright 2010-2011 Vicente J. Botet Escriba
+// (C) Copyright 2011 Vicente J. Botet Escriba
 // Use, modification and distribution are subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt).

Modified: trunk/boost/chrono/io/ios_base_state.hpp
==============================================================================
--- trunk/boost/chrono/io/ios_base_state.hpp (original)
+++ trunk/boost/chrono/io/ios_base_state.hpp 2011-11-10 12:10:31 EST (Thu, 10 Nov 2011)
@@ -1,6 +1,6 @@
 // boost/chrono/io/ios_base_state.hpp
 //
-// (C) Copyright 2010-2011 Vicente J. Botet Escriba
+// (C) Copyright 2011 Vicente J. Botet Escriba
 // Use, modification and distribution are subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt).

Modified: trunk/boost/chrono/io/time_point_units.hpp
==============================================================================
--- trunk/boost/chrono/io/time_point_units.hpp (original)
+++ trunk/boost/chrono/io/time_point_units.hpp 2011-11-10 12:10:31 EST (Thu, 10 Nov 2011)
@@ -129,7 +129,7 @@
       do_put(iter_type s, std::ios_base& ios, steady_clock) const = 0;
       virtual std::basic_string<CharT> do_get_epoch(steady_clock) const=0;
 
-//#if defined(BOOST_CHRONO_HAS_PROCESS_CLOCKS)
+#if defined(BOOST_CHRONO_HAS_PROCESS_CLOCKS)
       virtual iter_type do_put(iter_type s, std::ios_base& ios, process_real_cpu_clock c) const =0;
       virtual std::basic_string<CharT> do_get_epoch(process_real_cpu_clock) const=0;
       virtual iter_type do_put(iter_type s, std::ios_base& ios, process_user_cpu_clock c) const =0;
@@ -138,7 +138,7 @@
       virtual std::basic_string<CharT> do_get_epoch(process_system_cpu_clock) const=0;
       virtual iter_type do_put(iter_type s, std::ios_base& ios, process_cpu_clock c) const =0;
       virtual std::basic_string<CharT> do_get_epoch(process_cpu_clock) const=0;
-//#endif
+#endif
 #if defined(BOOST_CHRONO_HAS_THREAD_CLOCK)
       virtual iter_type do_put(iter_type s, std::ios_base& ios, thread_clock c) const =0;
       virtual std::basic_string<CharT> do_get_epoch(thread_clock) const=0;
@@ -208,7 +208,7 @@
         return clock_string<steady_clock,CharT>::since();
       }
 
-//#if defined(BOOST_CHRONO_HAS_PROCESS_CLOCKS)
+#if defined(BOOST_CHRONO_HAS_PROCESS_CLOCKS)
       iter_type do_put(iter_type s, std::ios_base& , process_real_cpu_clock c) const
       {
         std::basic_string<CharT> str = do_get_epoch(c);
@@ -246,7 +246,7 @@
         return clock_string<process_cpu_clock,CharT>::since();
       }
 
-//#endif
+#endif
 #if defined(BOOST_CHRONO_HAS_THREAD_CLOCK)
       iter_type do_put(iter_type s, std::ios_base& , thread_clock c) const
       {


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