[Boost-commit] svn:boost r75328 - in trunk/boost/chrono/io: . utility

Subject: [Boost-commit] svn:boost r75328 - in trunk/boost/chrono/io: . utility
From: vicente.botet_at_[hidden]
Date: 2011-11-05 18:05:24

Author: viboes
Date: 2011-11-05 18:05:23 EDT (Sat, 05 Nov 2011)
New Revision: 75328
URL: http://svn.boost.org/trac/boost/changeset/75328

Log:
Chrono: Cleanup
Text files modified: 
   trunk/boost/chrono/io/ios_base_state.hpp             |   142 --------------------------------------- 
   trunk/boost/chrono/io/utility/ios_base_state_ptr.hpp |     4 +                                       
   2 files changed, 5 insertions(+), 141 deletions(-)

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-05 18:05:23 EDT (Sat, 05 Nov 2011)
@@ -59,153 +59,27 @@
       }
     };
 
-
-#if 0
-    namespace detail
-    {
-
-      enum chrono_fmt_masks
-      {
-        duration_style_mask = 1 << 0, timezone_mask = 1 << 1, registerd_callback_mask = 1 << 2
-      };
-
-      inline int chrono_io_masks_index()
-      {
-        static const int v_ = std::ios_base::xalloc();
-        return v_;
-      }
-      inline bool is_registerd(std::ios_base & ios)
-      {
-        long iw = ios.iword(chrono_io_masks_index());
-        return (iw & registerd_callback_mask);
-      }
-      inline void set_registered(std::ios_base& ios)
-      {
-        long& iw = ios.iword(chrono_io_masks_index());
-        iw |= registerd_callback_mask;
-      }
-    }// detail
-#endif
-
     inline duration_style::type get_duration_style(std::ios_base & ios)
     {
       return fmt_masks(ios).get_duration_style();
-      //long iw = ios.iword(detail::chrono_io_masks_index());
-      //return (iw & detail::duration_style_mask) ? duration_style::symbol : duration_style::prefix;
     }
     inline void set_duration_style(std::ios_base& ios, duration_style::type style)
     {
       fmt_masks(ios).set_duration_style(style);
-      //long& iw = ios.iword(detail::chrono_io_masks_index());
-      //iw &= ~detail::duration_style_mask;
-      //iw |= (style ? detail::duration_style_mask : 0);
     }
 
     inline timezone_type get_timezone(std::ios_base & ios)
     {
       return fmt_masks(ios).get_timezone();
-      //long iw = ios.iword(detail::chrono_io_masks_index());
-      //return (iw & detail::timezone_mask) ? timezone::local : timezone::utc;
     }
     inline void set_timezone(std::ios_base& ios, timezone_type tz)
     {
       fmt_masks(ios).set_timezone(tz);
-      //long& iw = ios.iword(detail::chrono_io_masks_index());
-      //iw &= ~detail::timezone_mask;
-      //iw |= (style ? detail::timezone_mask : 0);
     }
 
     namespace detail
     {
-#if 0
-      template<typename CharT>
-      class ios_base_data
-      {
-      public:
-
-        ios_base_data() :
-          time_fmt_(""),
-          duration_fmt_("")
-        {
-        }
 
-        static inline ios_base_data<CharT>& instance(std::ios_base & ios)
-        {
-          register_once(index(), ios);
-          void* &pw = ios.pword(index());
-          if (pw == 0)
-          {
-            pw = new ios_base_data<CharT>();
-          }
-          return *static_cast<ios_base_data<CharT>*> (pw);
-        }
-
-        inline std::basic_string<CharT> get_time_fmt()
-        {
-          return time_fmt_;
-        }
-        inline void set_time_fmt(std::basic_string<CharT> fmt)
-        {
-          time_fmt_=fmt;
-        }
-        inline std::basic_string<CharT> get_duration_fmt()
-        {
-          return duration_fmt_;
-        }
-        inline void set_duration_fmt(std::basic_string<CharT> fmt)
-        {
-          duration_fmt_=fmt;
-        }
-      private:
-        static inline void callback(std::ios_base::event evt, std::ios_base& ios, int index)
-        {
-          switch (evt)
-          {
-          case std::ios_base::erase_event:
-          {
-            void*& pw = ios.pword(index);
-            if (pw != 0)
-            {
-              ios_base_data* tmi = static_cast<ios_base_data<CharT>*> (pw);
-              delete tmi;
-              pw = 0;
-            }
-            break;
-          }
-          case std::ios_base::copyfmt_event:
-          {
-            void*& pw = ios.pword(index);
-            if (pw != 0)
-            {
-              pw = new ios_base_data(*static_cast<ios_base_data<CharT>*> (pw));
-            }
-            break;
-          }
-          default:
-            break;
-          }
-        }
-
-        static inline void register_once(int index, std::ios_base& ios)
-        {
-          if (!detail::is_registerd(ios))
-          {
-            detail::set_registered(ios);
-            ios.register_callback(callback, index);
-          }
-        }
-
-        static inline int index()
-        {
-          static const int v_ = std::ios_base::xalloc();
-          return v_;
-        }
-
-        std::basic_string<CharT> time_fmt_;
-        std::basic_string<CharT> duration_fmt_;
-
-      };
-#else
       template<typename CharT>
       struct ios_base_data_aux
       {
@@ -220,22 +94,8 @@
         }
       };
 
-#endif
     } // detail
 
-#if 0
-    template<typename CharT>
-    static inline std::basic_string<CharT> get_time_fmt(std::ios_base & ios)
-    {
-      return detail::ios_base_data<CharT>::instance(ios).get_time_fmt();
-    }
-    template<typename CharT>
-    static inline void set_time_fmt(std::ios_base& ios, std::basic_string<
-        CharT> fmt)
-    {
-      detail::ios_base_data<CharT>::instance(ios).set_time_fmt(fmt);
-    }
-#else
     template<typename CharT>
     static inline std::basic_string<CharT> get_time_fmt(std::ios_base & ios)
     {
@@ -249,7 +109,7 @@
       ios_base_state<detail::ios_base_data_aux<CharT> > ptr(ios);
       ptr->time_fmt = fmt;
     }
-#endif
+
   } // chrono
 } // boost
 

Modified: trunk/boost/chrono/io/utility/ios_base_state_ptr.hpp
==============================================================================
--- trunk/boost/chrono/io/utility/ios_base_state_ptr.hpp	(original)
+++ trunk/boost/chrono/io/utility/ios_base_state_ptr.hpp	2011-11-05 18:05:23 EDT (Sat, 05 Nov 2011)
@@ -32,6 +32,10 @@
     {
     public:
       /**
+       * The pointee type
+       */
+      typedef T element_type;
+      /**
        * Explicit constructor.
        * @param ios the ios
        * @Effects Constructs a @c ios_base_state_ptr by storing the associated @c ios.