Permalink
Browse files

Enable C++11 features in gtest.

BUG=
TEST=unittest
REF_BUG=19010851
REF_CL=84755788
  • Loading branch information...
1 parent 7ec05c0 commit aff84de21a81be7f7e0201aa1426a00f4396f740 @yukawa yukawa committed Oct 25, 2015
Showing with 3 additions and 9 deletions.
  1. +1 −1 src/mozc_version_template.txt
  2. +2 −8 src/testing/testing.gyp
@@ -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.
@@ -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.

0 comments on commit aff84de

Please sign in to comment.