From 4de8f55113007fdc8e34107950e605fc0209d465 Mon Sep 17 00:00:00 2001 From: "jieluo@google.com" Date: Fri, 18 Jul 2014 00:47:59 +0000 Subject: down integrate to svn --- src/google/protobuf/generated_enum_reflection.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/google/protobuf/generated_enum_reflection.h') diff --git a/src/google/protobuf/generated_enum_reflection.h b/src/google/protobuf/generated_enum_reflection.h index a09a540b..2780a9b3 100644 --- a/src/google/protobuf/generated_enum_reflection.h +++ b/src/google/protobuf/generated_enum_reflection.h @@ -41,6 +41,8 @@ #include +#include + namespace google { namespace protobuf { class EnumDescriptor; @@ -48,6 +50,10 @@ namespace protobuf { namespace protobuf { +// This type trait can be used to cause templates to only match proto2 enum +// types. +template struct is_proto_enum : ::google::protobuf::internal::false_type {}; + // Returns the EnumDescriptor for enum type E, which must be a // proto-declared enum type. Code generated by the protocol compiler // will include specializations of this template for each enum type declared. -- cgit v1.2.3