Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r66279 - sandbox/chrono/boost/chrono
From: vicente.botet_at_[hidden]
Date: 2010-10-30 12:22:06


Author: viboes
Date: 2010-10-30 12:22:03 EDT (Sat, 30 Oct 2010)
New Revision: 66279
URL: http://svn.boost.org/trac/boost/changeset/66279

Log:
Chrono: Fix chrono_io clock_string

Text files modified:
   sandbox/chrono/boost/chrono/chrono_io.hpp | 28 ++++++++++++++--------------
   1 files changed, 14 insertions(+), 14 deletions(-)

Modified: sandbox/chrono/boost/chrono/chrono_io.hpp
==============================================================================
--- sandbox/chrono/boost/chrono/chrono_io.hpp (original)
+++ sandbox/chrono/boost/chrono/chrono_io.hpp 2010-10-30 12:22:03 EDT (Sat, 30 Oct 2010)
@@ -474,14 +474,14 @@
 template <class CharT>
 struct clock_string<system_clock, CharT>
 {
- static std::string name()
+ static std::basic_string<CharT> name()
     {
         static const CharT u[] = {'s', 'y', 's', 't', 'e', 'm', '_',
                                                         'c', 'l','o', 'c', 'k'};
         static const std::basic_string<CharT> str(u, u + sizeof(u)/sizeof(u[0]));
             return str;
     }
- static std::string since()
+ static std::basic_string<CharT> since()
     {
         static const CharT u[] = {' ', 's', 'i', 'n', 'c', 'e', ' ', 'J', 'a',
                               'n', ' ', '1', ',', ' ', '1', '9', '7', '0'};
@@ -494,14 +494,14 @@
 template <class CharT>
 struct clock_string<monotonic_clock, CharT>
 {
- static std::string name()
+ static std::basic_string<CharT> name()
     {
         static const CharT u[] = {'m', 'o', 'n', 'o', 't', 'o', 'n', 'i', 'c', '_',
                                                         'c', 'l','o', 'c', 'k'};
         static const std::basic_string<CharT> str(u, u + sizeof(u)/sizeof(u[0]));
             return str;
     }
- static std::string since()
+ static std::basic_string<CharT> since()
     {
         const CharT u[] = {' ', 's', 'i', 'n', 'c', 'e', ' ', 'b', 'o', 'o', 't'};
         const std::basic_string<CharT> str(u, u + sizeof(u)/sizeof(u[0]));
@@ -517,14 +517,14 @@
 template <class CharT>
 struct clock_string<thread_clock, CharT>
 {
- static std::string name()
+ static std::basic_string<CharT> name()
     {
         static const CharT u[] = {'t', 'h', 'r', 'e', 'd', '_',
                                                         'c', 'l','o', 'c', 'k'};
         static const std::basic_string<CharT> str(u, u + sizeof(u)/sizeof(u[0]));
             return str;
     }
- static std::string since()
+ 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'};
         const std::basic_string<CharT> str(u, u + sizeof(u)/sizeof(u[0]));
@@ -537,14 +537,14 @@
 template <class CharT>
 struct clock_string<process_real_cpu_clock, CharT>
 {
- static std::string name()
+ static std::basic_string<CharT> name()
     {
         static const CharT u[] = {'p', 'r', 'o', 'c', 'e', 's', 's', '_', 'r', 'e', 'a', 'l','_',
                                                         'c', 'l','o', 'c', 'k'};
         static const std::basic_string<CharT> str(u, u + sizeof(u)/sizeof(u[0]));
             return str;
     }
- static std::string since()
+ static std::basic_string<CharT> since()
     {
         const CharT u[] = {' ', 's', 'i', 'n', 'c', 'e', ' ', 'p', 'r', 'o', 'c', 'e', 's', 's', ' ', 's', 't', 'a', 'r', 't', '-', 'u', 'p'};
         const std::basic_string<CharT> str(u, u + sizeof(u)/sizeof(u[0]));
@@ -555,14 +555,14 @@
 template <class CharT>
 struct clock_string<process_user_cpu_clock, CharT>
 {
- static std::string name()
+ static std::basic_string<CharT> name()
     {
         static const CharT u[] = {'p', 'r', 'o', 'c', 'e', 's', 's', '_', 'u', 's', 'e', 'r','_',
                                                         'c', 'l','o', 'c', 'k'};
         static const std::basic_string<CharT> str(u, u + sizeof(u)/sizeof(u[0]));
             return str;
     }
- static std::string since()
+ static std::basic_string<CharT> since()
     {
         const CharT u[] = {' ', 's', 'i', 'n', 'c', 'e', ' ', 'p', 'r', 'o', 'c', 'e', 's', 's', ' ', 's', 't', 'a', 'r', 't', '-', 'u', 'p'};
         const std::basic_string<CharT> str(u, u + sizeof(u)/sizeof(u[0]));
@@ -573,14 +573,14 @@
 template <class CharT>
 struct clock_string<process_system_cpu_clock, CharT>
 {
- static std::string name()
+ static std::basic_string<CharT> name()
     {
         static const CharT u[] = {'p', 'r', 'o', 'c', 'e', 's', 's', '_', 's', 'y', 's', 't', 't', 'e', 'm', '_',
                                                         'c', 'l','o', 'c', 'k'};
         static const std::basic_string<CharT> str(u, u + sizeof(u)/sizeof(u[0]));
             return str;
     }
- static std::string since()
+ static std::basic_string<CharT> since()
     {
         const CharT u[] = {' ', 's', 'i', 'n', 'c', 'e', ' ', 'p', 'r', 'o', 'c', 'e', 's', 's', ' ', 's', 't', 'a', 'r', 't', '-', 'u', 'p'};
         const std::basic_string<CharT> str(u, u + sizeof(u)/sizeof(u[0]));
@@ -591,14 +591,14 @@
 template <class CharT>
 struct clock_string<process_cpu_clock, CharT>
 {
- static std::string name()
+ static std::basic_string<CharT> name()
     {
         static const CharT u[] = {'p', 'r', 'o', 'c', 'e', 's', 's', '_',
                                                         'c', 'l','o', 'c', 'k'};
         static const std::basic_string<CharT> str(u, u + sizeof(u)/sizeof(u[0]));
             return str;
     }
- static std::string since()
+ static std::basic_string<CharT> since()
     {
         const CharT u[] = {' ', 's', 'i', 'n', 'c', 'e', ' ', 'p', 'r', 'o', 'c', 'e', 's', 's', ' ', 's', 't', 'a', 'r', 't', '-', 'u', 'p'};
         const std::basic_string<CharT> str(u, u + sizeof(u)/sizeof(u[0]));


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