Fixing warnings, updating gtest

bmatheny · Dec 2, 2014 · 5f1cf21 · 5f1cf21
1 parent d383bb0
commit 5f1cf21
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 15 deletions.
diff --git a/gtest b/gtest
diff --git a/src/logging/level.cpp b/src/logging/level.cpp
@@ -62,7 +62,7 @@ Level Level::fromValue(const uint32_t value)
   if (it != valueMap.end()) {
     return it->second;
   } else {
-    throw range_error("No such level with value " + value);
+    throw range_error("No such level with value " + std::to_string(value));
   }
 }
 

diff --git a/src/logging/logger.cpp b/src/logging/logger.cpp
@@ -154,7 +154,7 @@ void Logger::trace(const string &msg)
 {
   log(Level::TRACE, msg);
 }
-void Logger::trace(Record record, const string &fmt, ...)
+void Logger::trace(Record record, string fmt, ...)
 {
   LOG_WITH_VARARGS(Level::TRACE, record, fmt, this);
 }
@@ -163,7 +163,7 @@ void Logger::debug(const string &msg)
 {
   log(Level::DEBUG, msg);
 }
-void Logger::debug(Record record, const string &fmt, ...)
+void Logger::debug(Record record, string fmt, ...)
 {
   LOG_WITH_VARARGS(Level::DEBUG, record, fmt, this);
 }
@@ -172,7 +172,7 @@ void Logger::info(const string &msg)
 {
   log(Level::INFO, msg);
 }
-void Logger::info(Record record, const string &fmt, ...)
+void Logger::info(Record record, string fmt, ...)
 {
   LOG_WITH_VARARGS(Level::INFO, record, fmt, this);
 }
@@ -181,7 +181,7 @@ void Logger::warning(const string &msg)
 {
   log(Level::WARNING, msg);
 }
-void Logger::warning(Record record, const string &fmt, ...)
+void Logger::warning(Record record, string fmt, ...)
 {
   LOG_WITH_VARARGS(Level::WARNING, record, fmt, this);
 }
@@ -190,7 +190,7 @@ void Logger::error(const string &msg)
 {
   log(Level::ERROR, msg);
 }
-void Logger::error(Record record, const string &fmt, ...)
+void Logger::error(Record record, string fmt, ...)
 {
   LOG_WITH_VARARGS(Level::ERROR, record, fmt, this);
 }
@@ -199,7 +199,7 @@ void Logger::fatal(const string &msg)
 {
   log(Level::FATAL, msg);
 }
-void Logger::fatal(Record record, const string &fmt, ...)
+void Logger::fatal(Record record, string fmt, ...)
 {
   LOG_WITH_VARARGS(Level::FATAL, record, fmt, this);
 }

diff --git a/src/logging/logger.h b/src/logging/logger.h
@@ -64,17 +64,17 @@ class Logger
   void log(const Level &level, const Record &rec);
 
   void trace(const std::string &msg);
-  void trace(Record rec, const std::string &fmt, ...);
+  void trace(Record rec, std::string fmt, ...);
   void debug(const std::string &msg);
-  void debug(Record rec, const std::string &fmt, ...);
+  void debug(Record rec, std::string fmt, ...);
   void info(const std::string &msg);
-  void info(Record rec, const std::string &fmt, ...);
+  void info(Record rec, std::string fmt, ...);
   void warning(const std::string &msg);
-  void warning(Record rec, const std::string &fmt, ...);
+  void warning(Record rec, std::string fmt, ...);
   void error(const std::string &msg);
-  void error(Record rec, const std::string &fmt, ...);
+  void error(Record rec, std::string fmt, ...);
   void fatal(const std::string &msg);
-  void fatal(Record rec, const std::string &fmt, ...);
+  void fatal(Record rec, std::string fmt, ...);
  protected:
   Logger(const std::string &name);
   std::string format(const Record &rec);

diff --git a/src/logging/record.h b/src/logging/record.h
@@ -1,9 +1,14 @@
 #ifndef _LOGGING_RECORD_H
 #define _LOGGING_RECORD_H
 
+#include "logging/level.h"
+
 #include <string>
 #include <stdexcept>
-#include "logging/level.h"
+
+extern "C" {
+#include <sys/time.h>
+}
 
 namespace mckeys {