gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Determine the existence of hash_map/hash_set in gtest-port.h.

Browse Source
This commit is contained in:
kosak 2015-07-17 23:08:48 +00:00
parent 060b7452ec
commit fe95bc332d
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/gtest/internal/gtest-port.h
View File

@ -606,6 +606,15 @@ struct _RTL_CRITICAL_SECTION;
# include <time.h> // NOLINT # include <time.h> // NOLINT
#endif #endif
// Determines if hash_map/hash_set are available.
// Only used for testing against those containers.
#if !defined(GTEST_HAS_HASH_MAP_)
# if _MSC_VER
# define GTEST_HAS_HASH_MAP_ 1 // Indicates that hash_map is available.
# define GTEST_HAS_HASH_SET_ 1 // Indicates that hash_set is available.
# endif // _MSC_VER
#endif // !defined(GTEST_HAS_HASH_MAP_)
// Determines whether Google Test can use tr1/tuple. You can define // Determines whether Google Test can use tr1/tuple. You can define
// this macro to 0 to prevent Google Test from using tuple (any // this macro to 0 to prevent Google Test from using tuple (any
// feature depending on tuple with be disabled in this mode). // feature depending on tuple with be disabled in this mode).

1
src/gtest-port.cc
View File

@ -887,7 +887,6 @@ GTEST_API_ ::std::string FormatCompilerIndependentFileLocation(
return file_name + ":" + StreamableToString(line); return file_name + ":" + StreamableToString(line);
} }
GTestLog::GTestLog(GTestLogSeverity severity, const char* file, int line) GTestLog::GTestLog(GTestLogSeverity severity, const char* file, int line)
: severity_(severity) { : severity_(severity) {
const char* const marker = const char* const marker =

10
test/gtest-printers_test.cc
View File

@ -50,13 +50,13 @@
#include "gtest/gtest.h" #include "gtest/gtest.h"
// hash_map and hash_set are available under Visual C++. // hash_map and hash_set are available under Visual C++, or on Linux.
#if _MSC_VER #if GTEST_HAS_HASH_MAP_
# define GTEST_HAS_HASH_MAP_ 1 // Indicates that hash_map is available.
# include <hash_map> // NOLINT # include <hash_map> // NOLINT
# define GTEST_HAS_HASH_SET_ 1 // Indicates that hash_set is available. #endif // GTEST_HAS_HASH_MAP_
#if GTEST_HAS_HASH_SET_
# include <hash_set> // NOLINT # include <hash_set> // NOLINT
#endif // GTEST_OS_WINDOWS #endif // GTEST_HAS_HASH_SET_
#if GTEST_HAS_STD_FORWARD_LIST_ #if GTEST_HAS_STD_FORWARD_LIST_
# include <forward_list> // NOLINT # include <forward_list> // NOLINT