summaryrefslogtreecommitdiff
path: root/boost/chrono/thread_clock.hpp
diff options
context:
space:
mode:
Diffstat (limited to 'boost/chrono/thread_clock.hpp')
-rw-r--r--boost/chrono/thread_clock.hpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/boost/chrono/thread_clock.hpp b/boost/chrono/thread_clock.hpp
index 7022c61dc1..207697b4cc 100644
--- a/boost/chrono/thread_clock.hpp
+++ b/boost/chrono/thread_clock.hpp
@@ -17,10 +17,7 @@
#include <boost/chrono/config.hpp>
#include <boost/chrono/duration.hpp>
#include <boost/chrono/time_point.hpp>
-#if !defined BOOST_CHRONO_DONT_PROVIDE_HYBRID_ERROR_HANDLING
-#include <boost/system/error_code.hpp>
#include <boost/chrono/detail/system.hpp>
-#endif
#include <boost/chrono/clock_string.hpp>
#ifndef BOOST_CHRONO_HEADER_ONLY
@@ -49,7 +46,7 @@ struct clock_string<thread_clock, CharT>
static std::basic_string<CharT> name()
{
static const CharT u[] =
- { 't', 'h', 'r', 'e', 'd', '_',
+ { 't', 'h', 'r', 'e', 'a', 'd', '_',
'c', 'l','o', 'c', 'k'};
static const std::basic_string<CharT> str(u, u + sizeof(u)/sizeof(u[0]));
return str;
@@ -57,7 +54,7 @@ struct clock_string<thread_clock, CharT>
static std::basic_string<CharT> since()
{
const CharT u[] =
- { ' ', 's', 'i', 'n', 'c', 'e', ' ', 't', 'r', 'e', 'a', 'd', ' ', 's', 't', 'a', 'r', 't', '-', 'u', 'p'};
+ { ' ', 's', 'i', 'n', 'c', 'e', ' ', 't', 'h', 'r', 'e', 'a', 'd', ' ', 's', 't', 'a', 'r', 't', '-', 'u', 'p'};
const std::basic_string<CharT> str(u, u + sizeof(u)/sizeof(u[0]));
return str;
}