Changeset 132:013f568ceb32 in rrlib_logging


Ignore:
Timestamp:
22.12.2015 15:00:53 (5 years ago)
Author:
Tobias Föhst <foehst@…>
Branch:
default
Children:
133:b40692505bea, 136:8300cf13b47c
Parents:
128:d7a4d9a4379e (diff), 130:16624d4ea776 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Phase:
public
Message:

Merge with 13.10

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • messages/tStream.h

    r128 r131  
    200200   * \returns A reference to the altered stream (in this case the proxy) 
    201201   */ 
    202   inline tStream &operator << (const time::tTimestamp& value) 
     202  inline tStream &operator << (const rrlib::time::tTimestamp &value) 
     203  { 
     204    this->stream << time::ToIsoString(value); 
     205    return *this; 
     206  } 
     207 
     208  /*! Streaming operator for durations 
     209   * 
     210   * There are no iostream operators for the std::chrono::duration 
     211   * template. Therefore, we need an operator implementation here. 
     212   * 
     213   * \param value   The duration value to put into the stream. 
     214   * 
     215   * \returns A reference to the altered stream (in this case the proxy) 
     216   */ 
     217  inline tStream &operator << (const rrlib::time::tDuration &value) 
    203218  { 
    204219    this->stream << time::ToIsoString(value); 
  • messages/tStream.h

    r130 r131  
    6262#include <exception> 
    6363#include "rrlib/time/time.h" 
     64#include "rrlib/util/demangle.h" 
    6465 
    6566//---------------------------------------------------------------------- 
     
    151152  inline tStream &operator << (const std::exception &exception) 
    152153  { 
    153     this->stream << "Exception (" << typeid(exception).name() << "): " << exception.what(); 
    154     return *this; 
    155   } 
    156   inline tStream &operator << (std::exception &exception) 
    157   { 
    158     this->stream << "Exception (" << typeid(exception).name() << "): " << exception.what(); 
     154    this->stream << "Exception (" << util::Demangle(typeid(exception).name()) << "): " << exception.what(); 
    159155    return *this; 
    160156  } 
     
    206202  inline tStream &operator << (const rrlib::time::tTimestamp &value) 
    207203  { 
    208     this->stream << rrlib::time::ToIsoString(value); 
     204    this->stream << time::ToIsoString(value); 
    209205    return *this; 
    210206  } 
     
    221217  inline tStream &operator << (const rrlib::time::tDuration &value) 
    222218  { 
    223     this->stream << rrlib::time::ToIsoString(value); 
     219    this->stream << time::ToIsoString(value); 
    224220    return *this; 
    225221  } 
Note: See TracChangeset for help on using the changeset viewer.