[SVN-Commit] r1118 - in trunk: mail/thunderbird/files www/firefox-nightly/files

[svn-freebsd-gecko at chruetertee.ch]

Author: flo
Date: Sun Dec  9 18:17:32 2012
New Revision: 1118

Log:
Fix on head when using clang and libstdc++.

Reviewed by:	jbeich
Obtained from:	https://code.google.com/p/googletest/source/diff?spec=svn629&old=628&r=629&format=unidiff&path=%2Ftrunk%2Finclude%2Fgtest%2Finternal%2Fgtest-port.h

Added:
   trunk/mail/thunderbird/files/patch-mozilla-media-webrtc-trunk-testing-gtest-include-gtest-internal-gtest-port.h   (contents, props changed)
   trunk/www/firefox-nightly/files/patch-media-webrtc-trunk-testing-gtest-include-gtest-internal-gtest-port.h   (contents, props changed)

Added: trunk/mail/thunderbird/files/patch-mozilla-media-webrtc-trunk-testing-gtest-include-gtest-internal-gtest-port.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/mail/thunderbird/files/patch-mozilla-media-webrtc-trunk-testing-gtest-include-gtest-internal-gtest-port.h	Sun Dec  9 18:17:32 2012	(r1118)
@@ -0,0 +1,17 @@
+--- mozilla/media/webrtc/trunk/testing/gtest/include/gtest/internal/gtest-port.h.orig	2012-12-09 16:28:45.641625374 +0100
++++ mozilla/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
+ 

Added: trunk/www/firefox-nightly/files/patch-media-webrtc-trunk-testing-gtest-include-gtest-internal-gtest-port.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/www/firefox-nightly/files/patch-media-webrtc-trunk-testing-gtest-include-gtest-internal-gtest-port.h	Sun Dec  9 18:17:32 2012	(r1118)
@@ -0,0 +1,17 @@
+--- 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
+