Merge pull request #479 from neheb/patch-2

logging: Fix compilation with uClibc++
google · Oct 31, 2019 · 30f7f3e · 30f7f3e
2 parents 6f5699a + e24276a
commit 30f7f3e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/glog/logging.h.in b/src/glog/logging.h.in
@@ -1320,7 +1320,7 @@ inline void LogAtLevel(int const severity, std::string const &msg) {
 // reasonably good C++11 support, so we set LANG_CXX for it and
 // newer versions (_MSC_VER >= 1900).
 #if (defined(__GXX_EXPERIMENTAL_CXX0X__) || __cplusplus >= 201103L || \
-     (defined(_MSC_VER) && _MSC_VER >= 1900))
+     (defined(_MSC_VER) && _MSC_VER >= 1900)) && !defined(__UCLIBCXX_MAJOR__)
 // Helper for CHECK_NOTNULL().
 //
 // In C++11, all cases can be handled by a single function. Since the value