[Boost-commit] svn:boost r80471 - in branches/release/boost/chrono: . io

Subject: [Boost-commit] svn:boost r80471 - in branches/release/boost/chrono: . io
From: vicente.botet_at_[hidden]
Date: 2012-09-09 14:40:15

Author: viboes
Date: 2012-09-09 14:40:14 EDT (Sun, 09 Sep 2012)
New Revision: 80471
URL: http://svn.boost.org/trac/boost/changeset/80471

Log:
Chrono: Merged from trunk 1.52
Properties modified: 
   branches/release/boost/chrono/io/   (props changed)
Text files modified: 
   branches/release/boost/chrono/chrono_io.hpp         |    12 ++++++++++--                            
   branches/release/boost/chrono/config.hpp            |    24 +++++++++++++++++++++++-                
   branches/release/boost/chrono/io/ios_base_state.hpp |     4 ++--                                    
   3 files changed, 35 insertions(+), 5 deletions(-)

Modified: branches/release/boost/chrono/chrono_io.hpp
==============================================================================
--- branches/release/boost/chrono/chrono_io.hpp	(original)
+++ branches/release/boost/chrono/chrono_io.hpp	2012-09-09 14:40:14 EDT (Sun, 09 Sep 2012)
@@ -14,10 +14,18 @@
 #define BOOST_CHRONO_CHRONO_IO_HPP
 
 #include <boost/chrono/config.hpp>
-#if BOOST_CHRONO_VERSION == 2
+
+//#if BOOST_CHRONO_VERSION == 2
+//#include <boost/chrono/io/time_point_io.hpp>
+//#include <boost/chrono/io/duration_io.hpp>
+//#elif BOOST_CHRONO_VERSION == 1
+//#include <boost/chrono/io_v1/chrono_io.hpp>
+//#endif
+
+#if defined BOOST_CHRONO_DONT_PROVIDES_DEPRECATED_IO_SINCE_V2_0_0
 #include <boost/chrono/io/time_point_io.hpp>
 #include <boost/chrono/io/duration_io.hpp>
-#elif BOOST_CHRONO_VERSION == 1
+#else
 #include <boost/chrono/io_v1/chrono_io.hpp>
 #endif
 

Modified: branches/release/boost/chrono/config.hpp
==============================================================================
--- branches/release/boost/chrono/config.hpp	(original)
+++ branches/release/boost/chrono/config.hpp	2012-09-09 14:40:14 EDT (Sun, 09 Sep 2012)
@@ -114,6 +114,28 @@
 #endif
 #endif
 
+#if defined BOOST_CHRONO_PROVIDE_HYBRID_ERROR_HANDLING \
+ && defined BOOST_CHRONO_DONT_PROVIDE_HYBRID_ERROR_HANDLING
+#error "BOOST_CHRONO_PROVIDE_HYBRID_ERROR_HANDLING && BOOST_CHRONO_PROVIDE_HYBRID_ERROR_HANDLING defined"
+#endif
+
+#if defined BOOST_CHRONO_PROVIDES_DEPRECATED_IO_SINCE_V2_0_0 \
+ && defined BOOST_CHRONO_DONT_PROVIDES_DEPRECATED_IO_SINCE_V2_0_0
+#error "BOOST_CHRONO_PROVIDES_DEPRECATED_IO_SINCE_V2_0_0 && BOOST_CHRONO_DONT_PROVIDES_DEPRECATED_IO_SINCE_V2_0_0 defined"
+#endif
+
+#if ! defined BOOST_CHRONO_PROVIDE_HYBRID_ERROR_HANDLING \
+ && ! defined BOOST_CHRONO_DONT_PROVIDE_HYBRID_ERROR_HANDLING
+#define BOOST_CHRONO_PROVIDE_HYBRID_ERROR_HANDLING
+#endif
+
+#if (BOOST_CHRONO_VERSION == 2)
+#if ! defined BOOST_CHRONO_PROVIDES_DEPRECATED_IO_SINCE_V2_0_0 \
+ && ! defined BOOST_CHRONO_DONT_PROVIDES_DEPRECATED_IO_SINCE_V2_0_0
+#define BOOST_CHRONO_DONT_PROVIDES_DEPRECATED_IO_SINCE_V2_0_0
+#endif
+#endif
+
 #ifdef BOOST_CHRONO_HEADER_ONLY
 #define BOOST_CHRONO_INLINE inline
 #define BOOST_CHRONO_STATIC inline
@@ -143,7 +165,7 @@
 #define BOOST_CHRONO_DECL
 #endif
 
-//#define  BOOST_CHRONO_DONT_PROVIDE_HYBRID_ERROR_HANDLING
+
 
 //  enable automatic library variant selection  ------------------------------//
 

Modified: branches/release/boost/chrono/io/ios_base_state.hpp
==============================================================================
--- branches/release/boost/chrono/io/ios_base_state.hpp	(original)
+++ branches/release/boost/chrono/io/ios_base_state.hpp	2012-09-09 14:40:14 EDT (Sun, 09 Sep 2012)
@@ -131,13 +131,13 @@
     } // namespace detail
 
     template<typename CharT>
-    static inline std::basic_string<CharT> get_time_fmt(std::ios_base & ios)
+    inline std::basic_string<CharT> get_time_fmt(std::ios_base & ios)
     {
       ios_state_not_null_ptr<detail::ios_base_data<CharT>, detail::ios_base_data_aux<CharT> > ptr(ios);
       return ptr->time_fmt;
     }
     template<typename CharT>
-    static inline void set_time_fmt(std::ios_base& ios, std::basic_string<
+    inline void set_time_fmt(std::ios_base& ios, std::basic_string<
         CharT> const& fmt)
     {
       ios_state_not_null_ptr<detail::ios_base_data<CharT>, detail::ios_base_data_aux<CharT> > ptr(ios);