Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r85233 - trunk/boost
From: antoshkka_at_[hidden]
Date: 2013-08-07 07:12:52


Author: apolukhin
Date: 2013-08-07 07:12:51 EDT (Wed, 07 Aug 2013)
New Revision: 85233
URL: http://svn.boost.org/trac/boost/changeset/85233

Log:
Added workarounds for Intel compiler (refs #8956)

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

Modified: trunk/boost/progress.hpp
==============================================================================
--- trunk/boost/progress.hpp Wed Aug 7 07:08:01 2013 (r85232)
+++ trunk/boost/progress.hpp 2013-08-07 07:12:51 EDT (Wed, 07 Aug 2013) (r85233)
@@ -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


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