diff options
Diffstat (limited to 'src/google/protobuf/generated_message_reflection.h')
| -rw-r--r-- | src/google/protobuf/generated_message_reflection.h | 37 |
1 files changed, 18 insertions, 19 deletions
diff --git a/src/google/protobuf/generated_message_reflection.h b/src/google/protobuf/generated_message_reflection.h index 177312cf..0ffb3ff2 100644 --- a/src/google/protobuf/generated_message_reflection.h +++ b/src/google/protobuf/generated_message_reflection.h @@ -361,11 +361,11 @@ class GeneratedMessageReflection final : public Reflection { const FieldDescriptor* field) const override; bool GetBool(const Message& message, const FieldDescriptor* field) const override; - string GetString(const Message& message, + std::string GetString(const Message& message, const FieldDescriptor* field) const override; - const string& GetStringReference(const Message& message, + const std::string& GetStringReference(const Message& message, const FieldDescriptor* field, - string* scratch) const override; + std::string* scratch) const override; const EnumValueDescriptor* GetEnum( const Message& message, const FieldDescriptor* field) const override; int GetEnumValue(const Message& message, @@ -409,7 +409,7 @@ class GeneratedMessageReflection final : public Reflection { void SetBool(Message* message, const FieldDescriptor* field, bool value) const override; void SetString(Message* message, const FieldDescriptor* field, - const string& value) const override; + const std::string& value) const override; void SetEnum(Message* message, const FieldDescriptor* field, const EnumValueDescriptor* value) const override; void SetEnumValue(Message* message, const FieldDescriptor* field, @@ -435,12 +435,12 @@ class GeneratedMessageReflection final : public Reflection { int index) const override; bool GetRepeatedBool(const Message& message, const FieldDescriptor* field, int index) const override; - string GetRepeatedString(const Message& message, const FieldDescriptor* field, + std::string GetRepeatedString(const Message& message, const FieldDescriptor* field, int index) const override; - const string& GetRepeatedStringReference(const Message& message, + const std::string& GetRepeatedStringReference(const Message& message, const FieldDescriptor* field, int index, - string* scratch) const override; + std::string* scratch) const override; const EnumValueDescriptor* GetRepeatedEnum(const Message& message, const FieldDescriptor* field, int index) const override; @@ -466,7 +466,7 @@ class GeneratedMessageReflection final : public Reflection { void SetRepeatedBool(Message* message, const FieldDescriptor* field, int index, bool value) const override; void SetRepeatedString(Message* message, const FieldDescriptor* field, - int index, const string& value) const override; + int index, const std::string& value) const override; void SetRepeatedEnum(Message* message, const FieldDescriptor* field, int index, const EnumValueDescriptor* value) const override; @@ -492,7 +492,7 @@ class GeneratedMessageReflection final : public Reflection { void AddBool(Message* message, const FieldDescriptor* field, bool value) const override; void AddString(Message* message, const FieldDescriptor* field, - const string& value) const override; + const std::string& value) const override; void AddEnum(Message* message, const FieldDescriptor* field, const EnumValueDescriptor* value) const override; void AddEnumValue(Message* message, const FieldDescriptor* field, @@ -503,7 +503,7 @@ class GeneratedMessageReflection final : public Reflection { Message* new_entry) const override; const FieldDescriptor* FindKnownExtensionByName( - const string& name) const override; + const std::string& name) const override; const FieldDescriptor* FindKnownExtensionByNumber(int number) const override; bool SupportsUnknownEnumValues() const override; @@ -681,7 +681,7 @@ class GeneratedMessageReflection final : public Reflection { typedef void (*InitFunc)(); -struct LIBPROTOBUF_EXPORT AssignDescriptorsTable { +struct PROTOBUF_EXPORT AssignDescriptorsTable { once_flag once; InitFunc add_descriptors; const char* filename; @@ -695,9 +695,9 @@ struct LIBPROTOBUF_EXPORT AssignDescriptorsTable { const ServiceDescriptor** file_level_service_descriptors; }; -void LIBPROTOBUF_EXPORT AssignDescriptors(AssignDescriptorsTable* table); +void PROTOBUF_EXPORT AssignDescriptors(AssignDescriptorsTable* table); -struct LIBPROTOBUF_EXPORT DescriptorTable { +struct PROTOBUF_EXPORT DescriptorTable { bool is_initialized; InitFunc init_defaults; const char* descriptor; @@ -706,14 +706,13 @@ struct LIBPROTOBUF_EXPORT DescriptorTable { int size; // of serialized descriptor }; -void LIBPROTOBUF_EXPORT AddDescriptors(DescriptorTable* table, - const InitFunc* deps, - int num_deps); +void PROTOBUF_EXPORT AddDescriptors(DescriptorTable* table, + const InitFunc* deps, int num_deps); // These cannot be in lite so we put them in the reflection. -LIBPROTOBUF_EXPORT void UnknownFieldSetSerializer(const uint8* base, uint32 offset, uint32 tag, - uint32 has_offset, - io::CodedOutputStream* output); +PROTOBUF_EXPORT void UnknownFieldSetSerializer(const uint8* base, uint32 offset, + uint32 tag, uint32 has_offset, + io::CodedOutputStream* output); } // namespace internal } // namespace protobuf |