fix or silence compiler warnings about unreachable code, narrowing, a…

…nd unsafe functions Signed-off-by: Daniela Engert <[email protected]>
fmtlib · May 1, 2018 · 22c0e4d · 22c0e4d
1 parent ca31ca1
commit 22c0e4d
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 0 deletions.
diff --git a/include/fmt/format.h b/include/fmt/format.h
@@ -37,6 +37,11 @@
 #include <stdexcept>
 #include <stdint.h>
 
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable:4702 4244)
+#endif
+
 #include "core.h"
 
 #ifdef _SECURE_SCL
@@ -3606,4 +3611,8 @@ operator"" _a(const wchar_t *s, std::size_t) { return {s}; }
 # pragma clang diagnostic pop
 #endif
 
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
 #endif  // FMT_FORMAT_H_
diff --git a/include/fmt/printf.h b/include/fmt/printf.h
@@ -13,6 +13,11 @@
 
 #include "ostream.h"
 
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable:4702)
+#endif
+
 namespace fmt {
 namespace internal {
 
@@ -657,4 +662,9 @@ inline int fprintf(std::ostream &os, string_view format_str,
 }
 }  // namespace fmt
 
+
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
 #endif  // FMT_PRINTF_H_
diff --git a/include/fmt/time.h b/include/fmt/time.h
@@ -11,6 +11,11 @@
 #include "format.h"
 #include <ctime>
 
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable:4702)
+#endif
+
 namespace fmt {
 
 namespace internal{
@@ -42,12 +47,14 @@ inline std::tm localtime(std::time_t time) {
 
     bool fallback(int res) { return res == 0; }
 
+#ifndef _MSC_VER
     bool fallback(internal::null<>) {
       using namespace fmt::internal;
       std::tm *tm = std::localtime(&time_);
       if (tm) tm_ = *tm;
       return tm != FMT_NULL;
     }
+#endif
   };
   LocalTime lt(time);
   if (lt.run())
@@ -79,11 +86,13 @@ inline std::tm gmtime(std::time_t time) {
 
     bool fallback(int res) { return res == 0; }
 
+#ifndef _MSC_VER
     bool fallback(internal::null<>) {
       std::tm *tm = std::gmtime(&time_);
       if (tm) tm_ = *tm;
       return tm != FMT_NULL;
     }
+#endif
   };
   GMTime gt(time);
   if (gt.run())
@@ -148,4 +157,8 @@ struct formatter<std::tm, Char> {
 };
 }
 
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
 #endif  // FMT_TIME_H_