Merge pull request #15 from Timothy-Liuxf/master

Upgrade to v0.2.3.1

.gitattributes

@@ -43,8 +43,3 @@
 # in Unix via a file share from Windows, the scripts will work.
 ###############################################################################
 *.sh text eol=lf
-
-###############################################################################
-# Correct Github language recognition
-###############################################################################
-Makefile.inc.am linguist-language=Makefile

CMakeLists.txt

@@ -7,7 +7,7 @@ project(simple_logger
 )
 set(CMAKE_CXX_STANDARD 17)
 if(MSVC)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX /utf-8")
 else()
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wpedantic -Werror")
 endif()

Makefile.am

@@ -1,9 +1,9 @@
 noinst_PROGRAMS =
 noinst_HEADERS =
 
-include third_party/Makefile.inc.am
-include include/simple_logger/Makefile.inc.am
+include third_party/Makefile.inc
+include include/simple_logger/Makefile.inc
 
 if BUILD_TEST_EXAMPLES
-include examples/Makefile.inc.am
+include examples/Makefile.inc
 endif

include/simple_logger/simple_logger.hpp

@@ -160,10 +160,9 @@ class Logger {
     (this->Trace() << ... << std::forward<Vals>(vals));
   }
 
-  template <typename Format, typename... Args>
-  void Tracef(Format&& fmt, Args&&... args) {
-    this->Trace() << fmt::format(std::forward<Format>(fmt),
-                                 std::forward<Args>(args)...);
+  template <typename... Args>
+  void Tracef(fmt::format_string<Args...> fmt, Args&&... args) {
+    this->Trace() << fmt::format(fmt, std::forward<Args>(args)...);
   }
 
   auto Debug() {
@@ -179,10 +178,9 @@ class Logger {
     (this->Debug() << ... << std::forward<Vals>(vals));
   }
 
-  template <typename Format, typename... Args>
-  void Debugf(Format&& fmt, Args&&... args) {
-    this->Debug() << fmt::format(std::forward<Format>(fmt),
-                                 std::forward<Args>(args)...);
+  template <typename... Args>
+  void Debugf(fmt::format_string<Args...> fmt, Args&&... args) {
+    this->Debug() << fmt::format(fmt, std::forward<Args>(args)...);
   }
 
   auto Info() {
@@ -198,10 +196,9 @@ class Logger {
     (this->Info() << ... << std::forward<Vals>(vals));
   }
 
-  template <typename Format, typename... Args>
-  void Infof(Format&& fmt, Args&&... args) {
-    this->Info() << fmt::format(std::forward<Format>(fmt),
-                                std::forward<Args>(args)...);
+  template <typename... Args>
+  void Infof(fmt::format_string<Args...> fmt, Args&&... args) {
+    this->Info() << fmt::format(fmt, std::forward<Args>(args)...);
   }
 
   auto Warn() {
@@ -217,10 +214,9 @@ class Logger {
     (this->Warn() << ... << std::forward<Vals>(vals));
   }
 
-  template <typename Format, typename... Args>
-  void Warnf(Format&& fmt, Args&&... args) {
-    this->Warn() << fmt::format(std::forward<Format>(fmt),
-                                std::forward<Args>(args)...);
+  template <typename... Args>
+  void Warnf(fmt::format_string<Args...> fmt, Args&&... args) {
+    this->Warn() << fmt::format(fmt, std::forward<Args>(args)...);
   }
 
   auto Error() {
@@ -236,10 +232,9 @@ class Logger {
     (this->Error() << ... << std::forward<Vals>(vals));
   }
 
-  template <typename Format, typename... Args>
-  void Errorf(Format&& fmt, Args&&... args) {
-    this->Error() << fmt::format(std::forward<Format>(fmt),
-                                 std::forward<Args>(args)...);
+  template <typename... Args>
+  void Errorf(fmt::format_string<Args...> fmt, Args&&... args) {
+    this->Error() << fmt::format(fmt, std::forward<Args>(args)...);
   }
 
   auto Fatal() {
@@ -255,10 +250,9 @@ class Logger {
     (this->Fatal() << ... << std::forward<Vals>(vals));
   }
 
-  template <typename Format, typename... Args>
-  void Fatalf(Format&& fmt, Args&&... args) {
-    this->Fatal() << fmt::format(std::forward<Format>(fmt),
-                                 std::forward<Args>(args)...);
+  template <typename... Args>
+  void Fatalf(fmt::format_string<Args...> fmt, Args&&... args) {
+    this->Fatal() << fmt::format(fmt, std::forward<Args>(args)...);
   }
 
  private: