diff options
author | Chris Kennelly <ckennelly@google.com> | 2016-12-14 14:03:55 -0800 |
---|---|---|
committer | Chris Kennelly <ckennelly@google.com> | 2016-12-14 14:03:55 -0800 |
commit | a902e2588d3917c867632e120906019cfca409fa (patch) | |
tree | 81748d3fab2948bbae670ad33aa59480eb25c198 /src/google/protobuf/generated_message_util.h | |
parent | 83d681ee2caef1feb009656417830f846382d8ba (diff) |
Define LANG_CXX11 for port.h and use this to guard C++11 features.
Diffstat (limited to 'src/google/protobuf/generated_message_util.h')
-rw-r--r-- | src/google/protobuf/generated_message_util.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/google/protobuf/generated_message_util.h b/src/google/protobuf/generated_message_util.h index 19bac7dc..14101832 100644 --- a/src/google/protobuf/generated_message_util.h +++ b/src/google/protobuf/generated_message_util.h @@ -46,7 +46,7 @@ #include <google/protobuf/has_bits.h> #ifndef PROTOBUF_FINAL -#if __cplusplus >= 201103L +#if LANG_CXX11 #define PROTOBUF_FINAL final #else #define PROTOBUF_FINAL @@ -99,7 +99,7 @@ class ExplicitlyConstructed { } } -#if __cplusplus >= 201103L +#if LANG_CXX11 constexpr #endif const T& |