aboutsummaryrefslogtreecommitdiff
path: root/src/google/protobuf/descriptor_database.cc
diff options
context:
space:
mode:
authorliujisi@google.com <liujisi@google.com@630680e5-0e50-0410-840e-4b1c322b438d>2010-12-03 09:12:33 +0000
committerliujisi@google.com <liujisi@google.com@630680e5-0e50-0410-840e-4b1c322b438d>2010-12-03 09:12:33 +0000
commit2726e7a6ebd72eec6f66abe4ced3c88983f20b8e (patch)
treedcf88bc5537ca5b35b1bee3af5c04505b7a90c94 /src/google/protobuf/descriptor_database.cc
parent0acafda8f424bb8a5adcf77bf2d4bdb3a9661d4b (diff)
downloadprotobuf-2726e7a6ebd72eec6f66abe4ced3c88983f20b8e.tar.gz
protobuf-2726e7a6ebd72eec6f66abe4ced3c88983f20b8e.tar.bz2
protobuf-2726e7a6ebd72eec6f66abe4ced3c88983f20b8e.zip
Fix issues: 166 167 172 175 181 188 192 194 195.
Diffstat (limited to 'src/google/protobuf/descriptor_database.cc')
-rw-r--r--src/google/protobuf/descriptor_database.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/google/protobuf/descriptor_database.cc b/src/google/protobuf/descriptor_database.cc
index 95708d94..23e48a67 100644
--- a/src/google/protobuf/descriptor_database.cc
+++ b/src/google/protobuf/descriptor_database.cc
@@ -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;
}