aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/google/protobuf/generated_enum_reflection.h
diff options
context:
space:
mode:
authorGravatar jieluo@google.com <jieluo@google.com@630680e5-0e50-0410-840e-4b1c322b438d>2014-07-18 00:47:59 +0000
committerGravatar jieluo@google.com <jieluo@google.com@630680e5-0e50-0410-840e-4b1c322b438d>2014-07-18 00:47:59 +0000
commit4de8f55113007fdc8e34107950e605fc0209d465 (patch)
tree92b7da8757a7740d9e1f2d3ead233542947d8c8c /src/google/protobuf/generated_enum_reflection.h
parentc5553a3d18f80132b9079c5504bc0aa1f7f950a0 (diff)
down integrate to svn
Diffstat (limited to 'src/google/protobuf/generated_enum_reflection.h')
-rw-r--r--src/google/protobuf/generated_enum_reflection.h6
1 files changed, 6 insertions, 0 deletions
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 <string>
+#include <google/protobuf/stubs/template_util.h>
+
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 <typename T> 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.