Added new StreamProxy ctor to streamline code. Fixed copy-paste errors.

Author: godbyk

inc/osvr/Util/Logger.h

@@ -127,7 +127,14 @@ namespace util {
             class StreamProxy {
               public:
                 StreamProxy(Logger &logger, LogLevel level)
-                    : logger_(logger), level_(level), os_(new std::ostringstream) {}
+                    : logger_(logger), level_(level),
+                      os_(new std::ostringstream) {}
+
+                StreamProxy(Logger &logger, LogLevel level, const char *msg)
+                    : logger_(logger), level_(level),
+                      os_(new std::ostringstream) {
+                    os_->operator<<(msg);
+                }
 
                 /// destructor appends the finished stringstream at the end
                 /// of the expression.
@@ -139,8 +146,8 @@ namespace util {
 
                 /// move construction
                 StreamProxy(StreamProxy &&other)
-                    : logger_(other.logger_), level_(other.level_), os_(std::move(other.os_)),
-                      active_(other.active_) {
+                    : logger_(other.logger_), level_(other.level_),
+                      os_(std::move(other.os_)), active_(other.active_) {
                     other.active_ = false;
                 }
 

src/osvr/Util/Logger.cpp

@@ -151,45 +151,31 @@ namespace util {
         }
 
         Logger::StreamProxy Logger::trace(const char *msg) {
-            StreamProxy proxy(*this, LogLevel::trace);
-            proxy << msg;
-            return proxy;
+            return { *this, LogLevel::trace, msg };
         }
 
         Logger::StreamProxy Logger::debug(const char *msg) {
-            StreamProxy proxy(*this, LogLevel::trace);
-            proxy << msg;
-            return proxy;
+            return { *this, LogLevel::debug, msg };
         }
 
         Logger::StreamProxy Logger::info(const char *msg) {
-            StreamProxy proxy(*this, LogLevel::trace);
-            proxy << msg;
-            return proxy;
+            return { *this, LogLevel::info, msg };
         }
 
         Logger::StreamProxy Logger::notice(const char *msg) {
-            StreamProxy proxy(*this, LogLevel::trace);
-            proxy << msg;
-            return proxy;
+            return { *this, LogLevel::notice, msg };
         }
 
         Logger::StreamProxy Logger::warn(const char *msg) {
-            StreamProxy proxy(*this, LogLevel::trace);
-            proxy << msg;
-            return proxy;
+            return { *this, LogLevel::warn, msg };
         }
 
         Logger::StreamProxy Logger::error(const char *msg) {
-            StreamProxy proxy(*this, LogLevel::trace);
-            proxy << msg;
-            return proxy;
+            return { *this, LogLevel::error, msg };
         }
 
         Logger::StreamProxy Logger::critical(const char *msg) {
-            StreamProxy proxy(*this, LogLevel::trace);
-            proxy << msg;
-            return proxy;
+            return { *this, LogLevel::critical, msg };
         }
 
         // logger.info() << ".." call  style