summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGennadiy Civil <misterg@google.com>2019-10-11 11:07:21 (GMT)
committerGennadiy Civil <misterg@google.com>2019-10-11 11:07:21 (GMT)
commiteafd2a91bb0c4fd626aae63ae852812fbd4999f2 (patch)
treeddd7e41267580892f7a80dc6d8610aa60a34b77e
parent37905b9d8c8fcc48a8c84416d4e561ad138cd7b7 (diff)
parent838ea5cea301b9158ecfa6665908bdf748d07909 (diff)
downloadgoogletest-eafd2a91bb0c4fd626aae63ae852812fbd4999f2.zip
googletest-eafd2a91bb0c4fd626aae63ae852812fbd4999f2.tar.gz
googletest-eafd2a91bb0c4fd626aae63ae852812fbd4999f2.tar.bz2
Merge pull request #2456 from kuzkry:gtest-port-clean-up_breaking-changes
PiperOrigin-RevId: 274100752
-rw-r--r--googletest/include/gtest/internal/gtest-port.h9
1 files changed, 0 insertions, 9 deletions
diff --git a/googletest/include/gtest/internal/gtest-port.h b/googletest/include/gtest/internal/gtest-port.h
index 3c9f725..f6433c5 100644
--- a/googletest/include/gtest/internal/gtest-port.h
+++ b/googletest/include/gtest/internal/gtest-port.h
@@ -441,15 +441,6 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION;
# endif // defined(_MSC_VER) || defined(__BORLANDC__)
#endif // GTEST_HAS_EXCEPTIONS
-#if !defined(GTEST_HAS_STD_STRING)
-// Even though we don't use this macro any longer, we keep it in case
-// some clients still depend on it.
-# define GTEST_HAS_STD_STRING 1
-#elif !GTEST_HAS_STD_STRING
-// The user told us that ::std::string isn't available.
-# error "::std::string isn't available."
-#endif // !defined(GTEST_HAS_STD_STRING)
-
#ifndef GTEST_HAS_STD_WSTRING
// The user didn't tell us whether ::std::wstring is available, so we need
// to figure it out.