e676e2910f
- update www/firefox-esr to 17.0.2 - update www/seamonkey to 2.15 (enigmail to 1.5.0) - remove QT4 option to avoid confusion (it turned out to be too experimental) In collaboration with: Jan Beich <jbeich@tormail.org> Security: http://www.vuxml.org/freebsd/a4ed6632-5aa9-11e2-8fcb-c8600054b392.html
17 lines
816 B
C++
17 lines
816 B
C++
--- media/webrtc/trunk/testing/gtest/include/gtest/internal/gtest-port.h.orig 2012-12-09 16:28:45.641625374 +0100
|
|
+++ media/webrtc/trunk/testing/gtest/include/gtest/internal/gtest-port.h 2012-12-09 19:09:11.664625374 +0100
|
|
@@ -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
|
|
|