| Index: build/common.gypi
|
| diff --git a/build/common.gypi b/build/common.gypi
|
| index 6301aebbfe145bd3c163fdc6a40f17b619faaf17..d54c83730091d6ed57d5dbabf3318da219d488e7 100644
|
| --- a/build/common.gypi
|
| +++ b/build/common.gypi
|
| @@ -4078,8 +4078,10 @@
|
| '-Wno-reserved-user-defined-literal',
|
| ],
|
| 'cflags_cc': [
|
| - # See the comment in the Mac section for what it takes to move
|
| - # this to -std=c++11.
|
| + # gnu++11 instead of c++11 is needed because some code uses
|
| + # typeof() (a GNU extension).
|
| + # TODO(thakis): Eventually switch this to c++11 instead,
|
| + # http://crbug.com/427584
|
| '-std=gnu++11',
|
| ],
|
| }],
|
| @@ -4834,12 +4836,7 @@
|
| # Note that the prebuilt Clang binaries should not be used for iOS
|
| # development except for ASan builds.
|
| ['clang==1', {
|
| - # gnu++11 instead of c++11 is needed because some code uses
|
| - # typeof() (a GNU extension).
|
| - # TODO(thakis): Eventually switch this to c++11 instead of
|
| - # gnu++11 (once typeof can be removed, which is blocked on c++11
|
| - # being available everywhere).
|
| - 'CLANG_CXX_LANGUAGE_STANDARD': 'gnu++11', # -std=gnu++11
|
| + 'CLANG_CXX_LANGUAGE_STANDARD': 'c++11', # -std=c++11
|
| # Warn if automatic synthesis is triggered with
|
| # the -Wobjc-missing-property-synthesis flag.
|
| 'CLANG_WARN_OBJC_MISSING_PROPERTY_SYNTHESIS': 'YES',
|
|
|