From fa4c5b50a9647af5ed22f874d090ea6b25176f78 Mon Sep 17 00:00:00 2001 From: Sergiu Dotenco Date: Thu, 26 Mar 2015 15:58:01 +0100 Subject: do not redefine stl logging macros --- src/stl_logging_unittest.cc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/stl_logging_unittest.cc b/src/stl_logging_unittest.cc index 20f23b3..63e28a1 100644 --- a/src/stl_logging_unittest.cc +++ b/src/stl_logging_unittest.cc @@ -41,11 +41,19 @@ // C++0x isn't enabled by default in GCC and libc++ does not have // non-standard ext/* and tr1/unordered_*. # if defined(_LIBCPP_VERSION) +# ifndef GLOG_STL_LOGGING_FOR_UNORDERED # define GLOG_STL_LOGGING_FOR_UNORDERED +# endif # else +# ifndef GLOG_STL_LOGGING_FOR_EXT_HASH # define GLOG_STL_LOGGING_FOR_EXT_HASH +# endif +# ifndef GLOG_STL_LOGGING_FOR_EXT_SLIST # define GLOG_STL_LOGGING_FOR_EXT_SLIST +# endif +# ifndef GLOG_STL_LOGGING_FOR_TR1_UNORDERED # define GLOG_STL_LOGGING_FOR_TR1_UNORDERED +# endif # endif #endif -- cgit v1.2.3