summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSergiu Dotenco <sergiu.dotenco@th-nuernberg.de>2015-03-26 14:58:01 (GMT)
committerSergiu Dotenco <sergiu.dotenco@gmail.com>2015-07-15 20:34:58 (GMT)
commitfa4c5b50a9647af5ed22f874d090ea6b25176f78 (patch)
tree7400d6e04289692491083b6eeddc59d12ed94682 /src
parentea628ae809aa3ab7ab9137103c4deea5c7485414 (diff)
downloadglog-fa4c5b50a9647af5ed22f874d090ea6b25176f78.zip
glog-fa4c5b50a9647af5ed22f874d090ea6b25176f78.tar.gz
glog-fa4c5b50a9647af5ed22f874d090ea6b25176f78.tar.bz2
do not redefine stl logging macros
Diffstat (limited to 'src')
-rw-r--r--src/stl_logging_unittest.cc8
1 files changed, 8 insertions, 0 deletions
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