diff options
| author |  Brad Larson <bklarson@gmail.com> | 2017-07-12 14:45:19 -0500 |
|---|---|---|
| committer | Brad Larson <bklarson@gmail.com> | 2017-07-12 14:45:19 -0500 |
| commit | 81142e162b7eea2c3f3483a11ce13a7fb5c20b88 (patch) | |
| tree | b82c2c848868dfeb93667b48a75ba3670aad1d00 | |
| parent | 727c0dc1fae6c7b72f59fb29f47a52f133618461 (diff) | |
Fix build when using -Werror=undef
Correct a couple places where macros were being checked when they
might not exist in some cases.
Fixes #3356.
| -rw-r--r-- | src/google/protobuf/io/coded_stream.h | 2 | ||||
| -rw-r--r-- | src/google/protobuf/stubs/hash.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/google/protobuf/io/coded_stream.h b/src/google/protobuf/io/coded_stream.h index 20d86143..9f1cf88c 100644 --- a/src/google/protobuf/io/coded_stream.h +++ b/src/google/protobuf/io/coded_stream.h @@ -1434,7 +1434,7 @@ inline bool CodedInputStream::IsFlat() const { } // namespace protobuf -#if _MSC_VER >= 1300 && !defined(__INTEL_COMPILER) +#if defined(_MSC_VER) && _MSC_VER >= 1300 && !defined(__INTEL_COMPILER) #pragma runtime_checks("c", restore) #endif // _MSC_VER && !defined(__INTEL_COMPILER) diff --git a/src/google/protobuf/stubs/hash.h b/src/google/protobuf/stubs/hash.h index 5924de98..612b5861 100644 --- a/src/google/protobuf/stubs/hash.h +++ b/src/google/protobuf/stubs/hash.h @@ -42,7 +42,7 @@ #define GOOGLE_PROTOBUF_HAVE_HASH_SET 1 // Use C++11 unordered_{map|set} if available. -#if ((_LIBCPP_STD_VER >= 11) || \ +#if ((defined(_LIBCPP_STD_VER) && _LIBCPP_STD_VER >= 11) || \ (((__cplusplus >= 201103L) || defined(__GXX_EXPERIMENTAL_CXX0X)) && \ (__GLIBCXX__ > 20090421))) # define GOOGLE_PROTOBUF_HAS_CXX11_HASH |