aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFeng Xiao <xfxyjwf@gmail.com>2014-12-03 18:15:19 -0800
committerFeng Xiao <xfxyjwf@gmail.com>2014-12-03 18:15:19 -0800
commit0eaae1e6ce8767a10de49fb130f9e7f066210d7b (patch)
treec06d2f53b2e64647f0fad743488ac8e5a3616c9a
parent6936f17b886f18b572cf5966f64d4a814a151044 (diff)
downloadprotobuf-0eaae1e6ce8767a10de49fb130f9e7f066210d7b.tar.gz
protobuf-0eaae1e6ce8767a10de49fb130f9e7f066210d7b.tar.bz2
protobuf-0eaae1e6ce8767a10de49fb130f9e7f066210d7b.zip
Replace is_enum with is_proto_enum because is_enum is not supported on some platforms.
-rw-r--r--src/google/protobuf/repeated_field_reflection.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/google/protobuf/repeated_field_reflection.h b/src/google/protobuf/repeated_field_reflection.h
index 42f7be20..44d14d5b 100644
--- a/src/google/protobuf/repeated_field_reflection.h
+++ b/src/google/protobuf/repeated_field_reflection.h
@@ -38,6 +38,8 @@
#include <google/protobuf/stubs/shared_ptr.h>
#endif
+#include <google/protobuf/generated_enum_reflection.h>
+
namespace google {
namespace protobuf {
namespace internal {
@@ -273,7 +275,7 @@ struct RefTypeTraits<
template<typename T>
struct RefTypeTraits<
- T, typename internal::enable_if<internal::is_enum<T>::value>::type> {
+ T, typename internal::enable_if<is_proto_enum<T>::value>::type> {
typedef RepeatedFieldRefIterator<T> iterator;
typedef RepeatedFieldAccessor AccessorType;
// We use int32 for repeated enums in RepeatedFieldAccessor.