From d3ed26f7cc7bd61979b505d71cc36b40ad7d6f18 Mon Sep 17 00:00:00 2001
From: Peter Johnson <johnson.peter@gmail.com>
Date: Sat, 10 Sep 2016 21:51:16 -0700
Subject: [PATCH] Logger: Use raw_ostream and SmallString.

---
 src/Log.h                        |  4 ----
 wpiutil/include/support/Logger.h | 12 +++++++-----
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/Log.h b/src/Log.h
index 08431511ff..05cf27cea6 100644
--- a/src/Log.h
+++ b/src/Log.h
@@ -8,10 +8,6 @@
 #ifndef NT_LOG_H_
 #define NT_LOG_H_
 
-#include <functional>
-#include <sstream>
-#include <string>
-
 #include "support/atomic_static.h"
 #include "support/Logger.h"
 
diff --git a/wpiutil/include/support/Logger.h b/wpiutil/include/support/Logger.h
index 44436c70b3..c19ab9d873 100644
--- a/wpiutil/include/support/Logger.h
+++ b/wpiutil/include/support/Logger.h
@@ -9,8 +9,9 @@
 #define WPIUTIL_SUPPORT_LOGGER_H_
 
 #include <functional>
-#include <sstream>
-#include <string>
+
+#include "llvm/raw_ostream.h"
+#include "llvm/SmallString.h"
 
 namespace wpi {
 
@@ -53,9 +54,10 @@ class Logger {
   do {                                                                 \
     ::wpi::Logger& WPI_logger_ = logger_inst;                          \
     if (WPI_logger_.min_level() <= level && WPI_logger_.HasLogger()) { \
-      std::ostringstream oss;                                          \
-      oss << x;                                                        \
-      WPI_logger_.Log(level, __FILE__, __LINE__, oss.str().c_str());   \
+      llvm::SmallString<128> log_buf_;                                 \
+      llvm::raw_svector_ostream log_os_{log_buf_};                     \
+      log_os_ << x;                                                    \
+      WPI_logger_.Log(level, __FILE__, __LINE__, log_buf_.c_str());    \
     }                                                                  \
   } while (0)