Changeset 117:5b163b2cb949 in rrlib_logging


Ignore:
Timestamp:
10.03.2014 16:01:27 (6 years ago)
Author:
Tobias Föhst <foehst@…>
Branch:
default
Parents:
115:a47d5c361f5e (diff), 116:55042ce457ee (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:

Merged with 13.10

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • messages/tStream.h

    r115 r117  
    238238  } 
    239239 
    240   template <typename T, typename ... Args> 
    241   inline tStream &operator << (T(*function)(Args...)) 
    242   { 
    243     *this << reinterpret_cast<void *>(function); 
    244     return *this; 
    245   } 
    246  
    247240  /*! Streaming operator for functions (forwarder) 
    248241   * 
  • messages/tStream.h

    r116 r117  
    6161 
    6262#include <exception> 
     63#include <cxxabi.h> 
     64 
    6365#include "rrlib/time/time.h" 
     66#include "rrlib/util/demangle.h" 
    6467 
    6568//---------------------------------------------------------------------- 
     
    151154  inline tStream &operator << (const std::exception &exception) 
    152155  { 
    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(); 
     156    this->stream << "Exception (" << util::Demangle(typeid(exception).name()) << "): " << exception.what(); 
    159157    return *this; 
    160158  } 
Note: See TracChangeset for help on using the changeset viewer.