diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-03-13 15:13:37 (GMT) |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-03-13 15:13:37 (GMT) |
| commit | af463c43ac22279239c1b8065ded7026b9224de1 (patch) | |
| tree | c28fdbabdd33d3153ac0ab86ec4e9e9ff57dc46a /googletest/include | |
| parent | cf9d6344d28020b70c634c898fe798c862148668 (diff) | |
| download | googletest-af463c43ac22279239c1b8065ded7026b9224de1.zip googletest-af463c43ac22279239c1b8065ded7026b9224de1.tar.gz googletest-af463c43ac22279239c1b8065ded7026b9224de1.tar.bz2 | |
More merges, removing old dead code
Diffstat (limited to 'googletest/include')
| -rw-r--r-- | googletest/include/gtest/internal/gtest-port.h | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/googletest/include/gtest/internal/gtest-port.h b/googletest/include/gtest/internal/gtest-port.h index 7a10d90..ccbdb76 100644 --- a/googletest/include/gtest/internal/gtest-port.h +++ b/googletest/include/gtest/internal/gtest-port.h @@ -363,16 +363,14 @@ #if GTEST_STDLIB_CXX11 # define GTEST_HAS_STD_BEGIN_AND_END_ 1 # define GTEST_HAS_STD_FORWARD_LIST_ 1 -# if !defined(_MSC_VER) || (_MSC_FULL_VER >= 190023824) // works only with VS2015U2 and better +# if !defined(_MSC_VER) || (_MSC_FULL_VER >= 190023824) +// works only with VS2015U2 and better # define GTEST_HAS_STD_FUNCTION_ 1 # endif # define GTEST_HAS_STD_INITIALIZER_LIST_ 1 # define GTEST_HAS_STD_MOVE_ 1 -# define GTEST_HAS_STD_SHARED_PTR_ 1 -# define GTEST_HAS_STD_TYPE_TRAITS_ 1 # define GTEST_HAS_STD_UNIQUE_PTR_ 1 -# define GTEST_HAS_UNORDERED_MAP_ 1 -# define GTEST_HAS_UNORDERED_SET_ 1 +# define GTEST_HAS_STD_SHARED_PTR_ 1 #endif // C++11 specifies that <tuple> provides std::tuple. @@ -982,13 +980,13 @@ using ::std::tuple_size; # endif #elif __GNUC__ >= 4 || defined(__clang__) # define GTEST_API_ __attribute__((visibility ("default"))) -#endif // _MSC_VER +#endif // _MSC_VER -#endif // GTEST_API_ +#endif // GTEST_API_ #ifndef GTEST_API_ # define GTEST_API_ -#endif // GTEST_API_ +#endif // GTEST_API_ #ifndef GTEST_DEFAULT_DEATH_TEST_STYLE # define GTEST_DEFAULT_DEATH_TEST_STYLE "fast" |