Enable C++11 features in gtest.

BUG= TEST=unittest REF_BUG=19010851 REF_CL=84755788
google · Oct 25, 2015 · aff84de · aff84de
1 parent 7ec05c0
commit aff84de
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/src/mozc_version_template.txt b/src/mozc_version_template.txt
@@ -1,6 +1,6 @@
 MAJOR=2
 MINOR=17
-BUILD=2135
+BUILD=2136
 REVISION=102
 # NACL_DICTIONARY_VERSION is the target version of the system dictionary to be
 # downloaded by NaCl Mozc.

diff --git a/src/testing/testing.gyp b/src/testing/testing.gyp
@@ -56,16 +56,10 @@
       'type': 'static_library',
       'variables': {
         'gtest_defines': [
-          'GTEST_HAS_TR1_TUPLE=1',
+          'GTEST_LANG_CXX11=1',
+          'GTEST_HAS_TR1_TUPLE=0',  # disable tr1 tuple in favor of C++11 tuple.
         ],
         'conditions': [
-          # TODO(yukawa): Get rid of the following workaround when C++11 is
-          # enabled on all the platforms.
-          ['target_platform!="Windows"', {
-            'gtest_defines': [
-              'GTEST_LANG_CXX11=0',  # non-Windows build is not ready
-            ],
-          }],
           ['_toolset=="target" and target_platform=="Android"', {
             'gtest_defines': [
               'GTEST_HAS_RTTI=0',  # Android NDKr7 requires this.