diff options
Diffstat (limited to 'boost/progress.hpp')
| -rw-r--r-- | boost/progress.hpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/boost/progress.hpp b/boost/progress.hpp index fbbf04a7f2..62bece0839 100644 --- a/boost/progress.hpp +++ b/boost/progress.hpp @@ -20,7 +20,7 @@ #define BOOST_PROGRESS_HPP #include <boost/timer.hpp> -#include <boost/utility.hpp> // for noncopyable +#include <boost/noncopyable.hpp> #include <boost/cstdint.hpp> // for uintmax_t #include <iostream> // for ostream, cout, etc #include <string> // for string @@ -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. @@ -77,20 +77,20 @@ class progress_timer : public timer, private noncopyable class progress_display : private noncopyable { public: - explicit progress_display( unsigned long expected_count, + explicit progress_display( unsigned long expected_count_, std::ostream & os = std::cout, const std::string & s1 = "\n", //leading strings 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 ) + void restart( unsigned long expected_count_ ) // Effects: display appropriate scale - // Postconditions: count()==0, expected_count()==expected_count + // Postconditions: count()==0, expected_count()==expected_count_ { _count = _next_tic_count = _tic = 0; - _expected_count = expected_count; + _expected_count = expected_count_; m_os << m_s1 << "0% 10 20 30 40 50 60 70 80 90 100%\n" << m_s2 << "|----|----|----|----|----|----|----|----|----|----|" |