diff options
Diffstat (limited to 'src/google/protobuf/descriptor_database.cc')
| -rw-r--r-- | src/google/protobuf/descriptor_database.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/google/protobuf/descriptor_database.cc b/src/google/protobuf/descriptor_database.cc index 95708d9..e5c2536 100644 --- a/src/google/protobuf/descriptor_database.cc +++ b/src/google/protobuf/descriptor_database.cc @@ -39,8 +39,8 @@ #include <google/protobuf/descriptor.pb.h> #include <google/protobuf/wire_format_lite_inl.h> #include <google/protobuf/stubs/strutil.h> -#include <google/protobuf/stubs/stl_util-inl.h> -#include <google/protobuf/stubs/map-util.h> +#include <google/protobuf/stubs/stl_util.h> +#include <google/protobuf/stubs/map_util.h> namespace google { namespace protobuf { @@ -101,7 +101,7 @@ bool SimpleDescriptorDatabase::DescriptorIndex<Value>::AddSymbol( if (iter == by_symbol_.end()) { // Apparently the map is currently empty. Just insert and be done with it. - by_symbol_.insert(make_pair(name, value)); + by_symbol_.insert(typename map<string, Value>::value_type(name, value)); return true; } @@ -128,7 +128,7 @@ bool SimpleDescriptorDatabase::DescriptorIndex<Value>::AddSymbol( // Insert the new symbol using the iterator as a hint, the new entry will // appear immediately before the one the iterator is pointing at. - by_symbol_.insert(iter, make_pair(name, value)); + by_symbol_.insert(iter, typename map<string, Value>::value_type(name, value)); return true; } @@ -289,6 +289,7 @@ bool SimpleDescriptorDatabase::FindAllExtensionNumbers( return index_.FindAllExtensionNumbers(extendee_type, output); } + bool SimpleDescriptorDatabase::MaybeCopy(const FileDescriptorProto* file, FileDescriptorProto* output) { if (file == NULL) return false; @@ -537,5 +538,6 @@ bool MergedDescriptorDatabase::FindAllExtensionNumbers( return success; } + } // namespace protobuf } // namespace google |