diff options
Diffstat (limited to 'src/google/protobuf/reflection.h')
| -rw-r--r-- | src/google/protobuf/reflection.h | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/google/protobuf/reflection.h b/src/google/protobuf/reflection.h index c14a896c..094701f7 100644 --- a/src/google/protobuf/reflection.h +++ b/src/google/protobuf/reflection.h @@ -42,6 +42,8 @@ #error "You cannot SWIG proto headers" #endif +#include <google/protobuf/port_def.inc> + namespace google { namespace protobuf { namespace internal { @@ -344,7 +346,7 @@ namespace internal { // // You can map from T to the actual type using RefTypeTraits: // typedef RefTypeTraits<T>::AccessorValueType ActualType; -class LIBPROTOBUF_EXPORT RepeatedFieldAccessor { +class PROTOBUF_EXPORT RepeatedFieldAccessor { public: // Typedefs for clarity. typedef void Field; @@ -573,12 +575,12 @@ struct RefTypeTraits< template<typename T> struct RefTypeTraits< - T, typename std::enable_if<std::is_same<string, T>::value>::type> { + T, typename std::enable_if<std::is_same<std::string, T>::value>::type> { typedef RepeatedFieldRefIterator<T> iterator; typedef RepeatedFieldAccessor AccessorType; - typedef string AccessorValueType; - typedef const string IteratorValueType; - typedef const string* IteratorPointerType; + typedef std::string AccessorValueType; + typedef const std::string IteratorValueType; + typedef const std::string* IteratorPointerType; static const FieldDescriptor::CppType cpp_type = FieldDescriptor::CPPTYPE_STRING; static const Descriptor* GetMessageFieldDescriptor() { @@ -617,4 +619,6 @@ struct RefTypeTraits< } // namespace protobuf } // namespace google +#include <google/protobuf/port_undef.inc> + #endif // GOOGLE_PROTOBUF_REFLECTION_H__ |