aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJisi Liu <liujisi@google.com>2017-12-19 14:41:13 -0800
committerGitHub <noreply@github.com>2017-12-19 14:41:13 -0800
commiteff55ece0813c16d318a80ec20c89d81bac34efc (patch)
tree8d067dffeb8bf04be541b6e2a860f57097d0db76
parent9ce29bd566e24a3df16abf0c9919b40d5d14a740 (diff)
parent501093d778258197cb8eec10d31cc9497520e459 (diff)
downloadprotobuf-eff55ece0813c16d318a80ec20c89d81bac34efc.tar.gz
protobuf-eff55ece0813c16d318a80ec20c89d81bac34efc.tar.bz2
protobuf-eff55ece0813c16d318a80ec20c89d81bac34efc.zip
Merge pull request #4074 from pherl/mapat
Replace C++11 only method std::map::at
-rw-r--r--src/google/protobuf/util/field_mask_util.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/util/field_mask_util.cc b/src/google/protobuf/util/field_mask_util.cc
index 4d0d3a46..8a413498 100644
--- a/src/google/protobuf/util/field_mask_util.cc
+++ b/src/google/protobuf/util/field_mask_util.cc
@@ -374,7 +374,7 @@ void FieldMaskTree::RemovePath(const string& path,
}
}
if (ContainsKey(node->children, parts[i])) {
- node = node->children.at(parts[i]);
+ node = node->children[parts[i]];
if (field_descriptor->cpp_type() == FieldDescriptor::CPPTYPE_MESSAGE) {
current_descriptor = field_descriptor->message_type();
}