diff options
| author | Josh Haberman <jhaberman@gmail.com> | 2018-09-04 10:58:54 -0700 |
|---|---|---|
| committer | Josh Haberman <jhaberman@gmail.com> | 2018-09-04 10:58:54 -0700 |
| commit | d61aede89cf188367766b971f59cf57d7835d8e8 (patch) | |
| tree | a19842c62c3c8f51389912ecafdf932d0a572bea /src/google/protobuf/util/internal/object_location_tracker.h | |
| parent | 45d03a977193d1dcce5251e4bffe17bf0ba738ec (diff) | |
| download | protobuf-d61aede89cf188367766b971f59cf57d7835d8e8.tar.gz protobuf-d61aede89cf188367766b971f59cf57d7835d8e8.tar.bz2 protobuf-d61aede89cf188367766b971f59cf57d7835d8e8.zip | |
Down-integrate from google3.
Diffstat (limited to 'src/google/protobuf/util/internal/object_location_tracker.h')
| -rw-r--r-- | src/google/protobuf/util/internal/object_location_tracker.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/util/internal/object_location_tracker.h b/src/google/protobuf/util/internal/object_location_tracker.h index 61189a79..571279d5 100644 --- a/src/google/protobuf/util/internal/object_location_tracker.h +++ b/src/google/protobuf/util/internal/object_location_tracker.h @@ -50,7 +50,7 @@ class ObjectLocationTracker : public LocationTrackerInterface { ~ObjectLocationTracker() override {} // Returns empty because nothing is tracked. - string ToString() const override { return ""; } + std::string ToString() const override { return ""; } private: GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ObjectLocationTracker); |