diff options
| author |  Adam Cozzette <acozzette@google.com> | 2018-03-13 16:37:29 -0700 |
|---|---|---|
| committer | Adam Cozzette <acozzette@google.com> | 2018-03-13 16:37:29 -0700 |
| commit | 0400cca3236de1ca303af38bf81eab332d042b7c (patch) | |
| tree | a8a9b19853f64567c96750a1c7d253926471daa5 /src/google/protobuf/generated_enum_util.h | |
| parent | 96b535cc2f4f7b7e22a1b8622149f7c26a5a3f63 (diff) | |
Integrated internal changes from Google
Diffstat (limited to 'src/google/protobuf/generated_enum_util.h')
| -rw-r--r-- | src/google/protobuf/generated_enum_util.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/google/protobuf/generated_enum_util.h b/src/google/protobuf/generated_enum_util.h index 4f5ded5b..96b03cc9 100644 --- a/src/google/protobuf/generated_enum_util.h +++ b/src/google/protobuf/generated_enum_util.h @@ -31,14 +31,14 @@ #ifndef GOOGLE_PROTOBUF_GENERATED_ENUM_UTIL_H__ #define GOOGLE_PROTOBUF_GENERATED_ENUM_UTIL_H__ -#include <google/protobuf/stubs/type_traits.h> +#include <type_traits> namespace google { namespace protobuf { // This type trait can be used to cause templates to only match proto2 enum // types. -template <typename T> struct is_proto_enum : ::google::protobuf::internal::false_type {}; +template <typename T> struct is_proto_enum : ::std::false_type {}; } // namespace protobuf |