Fix warnings.

c240a129 · Victor Zverovich · 90986824 · c240a129 · c240a129
Commit c240a129 authored Dec 21, 2012 by Victor Zverovich
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

format.cc format.cc +2 -0

format_test.cc format_test.cc +4 -1

No files found.
--- a/format.cc
+++ b/format.cc
@@ -28,6 +28,8 @@
 // Disable useless MSVC warnings.
 #undef _CRT_SECURE_NO_WARNINGS
 #define _CRT_SECURE_NO_WARNINGS
+#undef _SCL_SECURE_NO_WARNINGS
+#define _SCL_SECURE_NO_WARNINGS

 #include "format.h"


--- a/format_test.cc
+++ b/format_test.cc
@@ -28,6 +28,8 @@
 // Disable useless MSVC warnings.
 #undef _CRT_SECURE_NO_WARNINGS
 #define _CRT_SECURE_NO_WARNINGS
+#undef _SCL_SECURE_NO_WARNINGS
+#define _SCL_SECURE_NO_WARNINGS

 #include <cctype>
 #include <cfloat>
@@ -456,7 +458,8 @@ TEST(FormatterTest, RuntimePrecision) {
  EXPECT_THROW_MSG(Format("{0:.{1}}") << 0 << -1l,
      FormatError, "negative precision in format");
  if (sizeof(long) > sizeof(int)) {
-    EXPECT_THROW_MSG(Format("{0:.{1}}") << 0 << (INT_MAX + 1l),
+    long value = INT_MAX;
+    EXPECT_THROW_MSG(Format("{0:.{1}}") << 0 << (value + 1),
        FormatError, "number is too big in format");
  }
  EXPECT_THROW_MSG(Format("{0:.{1}}") << 0 << (INT_MAX + 1ul),