diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-03-13 20:02:05 (GMT) |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-03-13 20:02:05 (GMT) |
| commit | 2814b4b08910d62f8516cd3e4e77ef99ee7360e9 (patch) | |
| tree | ccf86cb52ed04c77b6f6cb185252b800276ad093 /googletest/include/gtest | |
| parent | a719320a3ce448dad588f0d5506e47fe84fa9d16 (diff) | |
| download | googletest-2814b4b08910d62f8516cd3e4e77ef99ee7360e9.zip googletest-2814b4b08910d62f8516cd3e4e77ef99ee7360e9.tar.gz googletest-2814b4b08910d62f8516cd3e4e77ef99ee7360e9.tar.bz2 | |
merging, merging
Diffstat (limited to 'googletest/include/gtest')
| -rw-r--r-- | googletest/include/gtest/internal/gtest-port.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/googletest/include/gtest/internal/gtest-port.h b/googletest/include/gtest/internal/gtest-port.h index ccbdb76..3e4f7b5 100644 --- a/googletest/include/gtest/internal/gtest-port.h +++ b/googletest/include/gtest/internal/gtest-port.h @@ -371,6 +371,8 @@ # define GTEST_HAS_STD_MOVE_ 1 # define GTEST_HAS_STD_UNIQUE_PTR_ 1 # define GTEST_HAS_STD_SHARED_PTR_ 1 +# define GTEST_HAS_UNORDERED_MAP_ 1 +# define GTEST_HAS_UNORDERED_SET_ 1 #endif // C++11 specifies that <tuple> provides std::tuple. |