# HG changeset patch # User Sebastien Jodogne # Date 1522052030 -7200 # Node ID 78862372ea8824fdb13ca64dd03e6ad2e78fe6db # Parent 2717a88723961050991020f2c64cf0ed0965b6da fix msvc build diff -r 2717a8872396 -r 78862372ea88 Core/Logging.h --- a/Core/Logging.h Sat Mar 24 12:02:52 2018 +0100 +++ b/Core/Logging.h Mon Mar 26 10:13:50 2018 +0200 @@ -59,6 +59,8 @@ # include #endif +#include + namespace Orthanc { namespace Logging @@ -91,13 +93,8 @@ { } - std::ostream& operator<< (const std::string& message) - { - return *this; - } - - // This overload fixes build problems with Visual Studio 2015 - std::ostream& operator<< (const char* message) + template + std::ostream& operator<< (const T& message) { return *this; } @@ -116,7 +113,6 @@ ORTHANC_ENABLE_LOGGING_STDIO == 1) # include -# include # define LOG(level) ::Orthanc::Logging::InternalLogger \ (::Orthanc::Logging::level, __FILE__, __LINE__) # define VLOG(level) ::Orthanc::Logging::InternalLogger \ @@ -148,7 +144,7 @@ ~InternalLogger(); template - InternalLogger& operator<< (T message) + InternalLogger& operator<< (const T& message) { message_ += boost::lexical_cast(message); return *this; @@ -186,15 +182,10 @@ ~InternalLogger(); - std::ostream& operator<< (const std::string& message) + template + std::ostream& operator<< (const T& message) { - return (*stream_) << message; - } - - // This overload fixes build problems with Visual Studio 2015 - std::ostream& operator<< (const char* message) - { - return (*stream_) << message; + return (*stream_) << boost::lexical_cast(message); } }; }