townforge/timer
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge from trunk:

Browse Source 
* Workarounds for Intel compiler (fixes #8956)


[SVN r85332]
This commit is contained in:
Antony Polukhin 2013-08-13 13:40:57 +00:00
parent 1be8a9d6b3
commit 9287481c7a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/boost/progress.hpp
View File

@ -38,7 +38,7 @@ class progress_timer : public timer, private noncopyable
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 @@ class progress_display : private noncopyable
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