aboutsummaryrefslogtreecommitdiff
path: root/src/google/protobuf/map_test_util.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/google/protobuf/map_test_util.h')
-rw-r--r--src/google/protobuf/map_test_util.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/google/protobuf/map_test_util.h b/src/google/protobuf/map_test_util.h
index dd397619..105313d4 100644
--- a/src/google/protobuf/map_test_util.h
+++ b/src/google/protobuf/map_test_util.h
@@ -107,15 +107,15 @@ class MapReflectionTester {
void ExpectClearViaReflectionIterator(Message* message);
void ExpectMapEntryClearViaReflection(Message* message);
void GetMapValueViaMapReflection(Message* message,
- const string& field_name,
+ const std::string& field_name,
const MapKey& map_key, MapValueRef* map_val);
- Message* GetMapEntryViaReflection(Message* message, const string& field_name,
+ Message* GetMapEntryViaReflection(Message* message, const std::string& field_name,
int index);
- MapIterator MapBegin(Message* message, const string& field_name);
- MapIterator MapEnd(Message* message, const string& field_name);
+ MapIterator MapBegin(Message* message, const std::string& field_name);
+ MapIterator MapEnd(Message* message, const std::string& field_name);
private:
- const FieldDescriptor* F(const string& name);
+ const FieldDescriptor* F(const std::string& name);
const Descriptor* base_descriptor_;
@@ -161,6 +161,6 @@ class MapReflectionTester {
};
} // namespace protobuf
-
} // namespace google
+
#endif // GOOGLE_PROTOBUF_MAP_TEST_UTIL_H__