Unified Diff: third_party/googletest.gyp
Issue 5163715573841920:
Issue 768 - Switch from TR1 to C++11 (Closed)
Patch Set:
Created July 11, 2014, 2:24 p.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« include/AdblockPlus/FilterEngine.h ('K')
|
« test/UpdateCheck.cpp ('k')
|
no next file »
|
no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: third_party/googletest.gyp |
| =================================================================== |
| --- a/third_party/googletest.gyp |
| +++ b/third_party/googletest.gyp |
| @@ -78,21 +78,16 @@ |
| }, |
| 'conditions': [[ |
| 'OS=="win"', |
| { |
| 'defines': [ '_VARIADIC_MAX=10' ], |
| 'direct_dependent_settings': { |
| 'defines': [ '_VARIADIC_MAX=10' ], |
| }, |
| - }, { |
| - 'defines': [ 'GTEST_HAS_TR1_TUPLE=1', 'GTEST_USE_OWN_TR1_TUPLE=0' ], |
| - 'direct_dependent_settings': { |
| - 'defines': [ 'GTEST_HAS_TR1_TUPLE=1', 'GTEST_USE_OWN_TR1_TUPLE=0' ], |
| - }, |
| }]], |
| }, |
| { |
| 'target_name': 'googletest_main', |
| 'type': '<(library)', |
| 'sources': ['googletest/src/gtest_main.cc'], |
| 'dependencies': ['googletest'], |
| 'export_dependent_settings': ['googletest'] |
« include/AdblockPlus/FilterEngine.h ('K')
|
« test/UpdateCheck.cpp ('k')
|
no next file »
|
no next file with comments »
