Bug 807492 Part 3 - Backport chunk of upstream gtest r629 to fix <tuple> detection on BSDs with old libstdc++, not breaking it on MacOSX r=upstream

This commit is contained in:
Landry Breuil 2013-06-13 08:41:49 +02:00
parent 4abbba9d72
commit bc2fe67dd1

View File

@ -490,10 +490,10 @@
# define GTEST_ENV_HAS_TR1_TUPLE_ 1
# endif
// C++11 specifies that <tuple> provides std::tuple. Users can't use
// gtest in C++11 mode until their standard library is at least that
// compliant.
# if GTEST_LANG_CXX11
// C++11 specifies that <tuple> provides std::tuple. Use that if gtest is used
// in C++11 mode and libstdc++ isn't very old (binaries targeting OS X 10.6
// can build with clang but need to use gcc4.2's libstdc++).
# if GTEST_LANG_CXX11 && (!defined(__GLIBCXX__) || __GLIBCXX__ > 20110325)
# define GTEST_ENV_HAS_STD_TUPLE_ 1
# endif