Commit dd6e420d authored by Adam Cozzette's avatar Adam Cozzette Committed by GitHub

Merge pull request #3357 from bklarson/master

Fix build when using -Werror=undef
parents eb8e3d32 81142e16
...@@ -1434,7 +1434,7 @@ inline bool CodedInputStream::IsFlat() const { ...@@ -1434,7 +1434,7 @@ inline bool CodedInputStream::IsFlat() const {
} // namespace protobuf } // namespace protobuf
#if _MSC_VER >= 1300 && !defined(__INTEL_COMPILER) #if defined(_MSC_VER) && _MSC_VER >= 1300 && !defined(__INTEL_COMPILER)
#pragma runtime_checks("c", restore) #pragma runtime_checks("c", restore)
#endif // _MSC_VER && !defined(__INTEL_COMPILER) #endif // _MSC_VER && !defined(__INTEL_COMPILER)
......
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
#define GOOGLE_PROTOBUF_HAVE_HASH_SET 1 #define GOOGLE_PROTOBUF_HAVE_HASH_SET 1
// Use C++11 unordered_{map|set} if available. // 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)) && \ (((__cplusplus >= 201103L) || defined(__GXX_EXPERIMENTAL_CXX0X)) && \
(__GLIBCXX__ > 20090421))) (__GLIBCXX__ > 20090421)))
# define GOOGLE_PROTOBUF_HAS_CXX11_HASH # define GOOGLE_PROTOBUF_HAS_CXX11_HASH
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment