From b7686b69950ec31aab47715ed138737de86d07d9 Mon Sep 17 00:00:00 2001 From: Sergiu Deitsch Date: Thu, 21 Dec 2023 22:01:35 +0100 Subject: [PATCH] cmake: remove obsolete check (#1002) --- CMakeLists.txt | 5 ----- src/glog/stl_logging.h.in | 12 +----------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f6bea0476..f6699cedd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -665,11 +665,6 @@ if (BUILD_TESTING) -Wno-deprecated) endif (HAVE_NO_DEPRECATED) - if (HAVE_EXT_SLIST) - target_compile_definitions (stl_logging_unittest PRIVATE - GLOG_STL_LOGGING_FOR_EXT_SLIST) - endif (HAVE_EXT_SLIST) - if (HAVE_SYMBOLIZE) add_executable (symbolize_unittest src/symbolize_unittest.cc diff --git a/src/glog/stl_logging.h.in b/src/glog/stl_logging.h.in index 49eec0397..4a3065552 100644 --- a/src/glog/stl_logging.h.in +++ b/src/glog/stl_logging.h.in @@ -1,4 +1,4 @@ -// Copyright (c) 2003, Google Inc. +// Copyright (c) 2023, Google Inc. // All rights reserved. // // Redistribution and use in source and binary forms, with or without @@ -35,14 +35,6 @@ // vector v1, v2; // CHECK_EQ(v1, v2); // -// If you want to use this header file with hash maps or slist, you -// need to define macros before including this file: -// -// - GLOG_STL_LOGGING_FOR_UNORDERED - and -// - GLOG_STL_LOGGING_FOR_TR1_UNORDERED - -// - GLOG_STL_LOGGING_FOR_EXT_HASH - -// - GLOG_STL_LOGGING_FOR_EXT_SLIST - -// #ifndef UTIL_GTL_STL_LOGGING_INL_H_ #define UTIL_GTL_STL_LOGGING_INL_H_ @@ -117,10 +109,8 @@ inline std::ostream& operator<<(std::ostream& out, \ return out; \ } -#if defined(GLOG_STL_LOGGING_FOR_UNORDERED) && __cplusplus >= 201103L OUTPUT_FIVE_ARG_CONTAINER(std::unordered_map) OUTPUT_FIVE_ARG_CONTAINER(std::unordered_multimap) -#endif #undef OUTPUT_FIVE_ARG_CONTAINER