[Boost-commit] svn:boost r85332 - branches/release/boost

Subject: [Boost-commit] svn:boost r85332 - branches/release/boost
From: antoshkka_at_[hidden]
Date: 2013-08-13 09:40:58

Author: apolukhin
Date: 2013-08-13 09:40:57 EDT (Tue, 13 Aug 2013)
New Revision: 85332
URL: http://svn.boost.org/trac/boost/changeset/85332

Log:
Merge from trunk:
* Workarounds for Intel compiler (fixes #8956)

Text files modified: 
   branches/release/boost/progress.hpp |     4 ++--                                    
   1 files changed, 2 insertions(+), 2 deletions(-)

Modified: branches/release/boost/progress.hpp
==============================================================================
--- branches/release/boost/progress.hpp	Tue Aug 13 09:08:37 2013	(r85331)
+++ branches/release/boost/progress.hpp	2013-08-13 09:40:57 EDT (Tue, 13 Aug 2013)	(r85332)
@@ -38,7 +38,7 @@
  public:
   explicit progress_timer( std::ostream & os = std::cout )
      // os is hint; implementation may ignore, particularly in embedded systems
-     : m_os(os) {}
+     : timer(), noncopyable(), m_os(os) {}
   ~progress_timer()
   {
   //  A) Throwing an exception from a destructor is a Bad Thing.
@@ -83,7 +83,7 @@
                              const std::string & s2 = "",
                              const std::string & s3 = "" )
    // os is hint; implementation may ignore, particularly in embedded systems
-   : m_os(os), m_s1(s1), m_s2(s2), m_s3(s3) { restart(expected_count); }
+   : noncopyable(), m_os(os), m_s1(s1), m_s2(s2), m_s3(s3) { restart(expected_count); }
 
   void           restart( unsigned long expected_count )
   //  Effects: display appropriate scale