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

Subject: [Boost-commit] svn:boost r74421 - trunk/boost/chrono
From: vicente.botet_at_[hidden]
Date: 2011-09-16 14:49:12

Author: viboes
Date: 2011-09-16 14:49:12 EDT (Fri, 16 Sep 2011)
New Revision: 74421
URL: http://svn.boost.org/trac/boost/changeset/74421

Log:
Chrono: fix error on gcc about timezone struct and function collision.
Text files modified: 
   trunk/boost/chrono/chrono_io.hpp |     4 ++--                                    
   1 files changed, 2 insertions(+), 2 deletions(-)

Modified: trunk/boost/chrono/chrono_io.hpp
==============================================================================
--- trunk/boost/chrono/chrono_io.hpp	(original)
+++ trunk/boost/chrono/chrono_io.hpp	2011-09-16 14:49:12 EDT (Fri, 16 Sep 2011)
@@ -668,7 +668,7 @@
         : std::locale::facet(refs), fmt_(fmt), tz_(tz) {}
 
     const string_type& fmt() const BOOST_CHRONO_NOEXCEPT {return fmt_;}
-    chrono::timezone::type timezone() const BOOST_CHRONO_NOEXCEPT {return tz_;}
+    chrono::timezone::type get_timezone() const BOOST_CHRONO_NOEXCEPT {return tz_;}
 };
 
     template <class CharT>
@@ -802,7 +802,7 @@
                 const F& f = std::use_facet<F>(loc);
                 pb = f.fmt().data();
                 pe = pb + f.fmt().size();
-                tz = f.timezone();
+                tz = f.get_timezone();
             }
             time_t t = system_clock::to_time_t(tp);
             tm tm;