generic-library/googletest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make Google Test build cleanly on Visual Studio 2010, 2012, 2013.

Browse Source 
Also improve an error message in gtest_test_utils.py.
This commit is contained in:
kosak
2014-01-13 22:24:15 +00:00
parent 6576c64903
commit 7d1051ce2b
6 changed files with 45 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/gtest/internal/gtest-tuple.h
View File

@@ -53,6 +53,14 @@
private:
#endif
// Visual Studio 2010, 2012, and 2013 define symbols in std::tr1 that conflict
// with our own definitions. Therefore using our own tuple does not work on
// those compilers.
#if defined(_MSC_VER) && _MSC_VER >= 1600 /* 1600 is Visual Studio 2010 */
# error "gtest's tuple doesn't compile on Visual Studio 2010 or later. \
GTEST_USE_OWN_TR1_TUPLE must be set to 0 on those compilers."
#endif
// GTEST_n_TUPLE_(T) is the type of an n-tuple.
#define GTEST_0_TUPLE_(T) tuple<>
#define GTEST_1_TUPLE_(T) tuple<T##0, void, void, void, void, void, void, \