commit fa4c5b50a9647af5ed22f874d090ea6b25176f78
author Sergiu Dotenco <sergiu.dotenco@th-nuernberg.de> Thu Mar 26 15:58:01 2015 +0100
committer Sergiu Dotenco <sergiu.dotenco@gmail.com> Wed Jul 15 22:34:58 2015 +0200
tree 7400d6e04289692491083b6eeddc59d12ed94682
parent ea628ae809aa3ab7ab9137103c4deea5c7485414

do not redefine stl logging macros

src/stl_logging_unittest.cc

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