Improve map insertions

snapshot/mac/mach_o_image_annotations_reader.cc

 // Copyright 2014 The Crashpad Authors. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
 //     http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
 #include "snapshot/mac/mach_o_image_annotations_reader.h"
 
 #include <mach-o/loader.h>
 #include <mach/mach.h>
 
+#include <utility>
+
 #include "base/logging.h"
 #include "client/crashpad_info.h"
 #include "client/simple_string_dictionary.h"
 #include "snapshot/mac/mach_o_image_reader.h"
 #include "snapshot/mac/process_reader.h"
 #include "util/mach/task_memory.h"
 #include "util/stdlib/strnlen.h"
 
 namespace crashpad {
 
@@ skipping 124 matching lines @@
                   &simple_annotations[0])) {
     LOG(WARNING) << "could not read simple annotations from " << name_;
     return;
   }
 
   for (const auto& entry : simple_annotations) {
     size_t key_length = strnlen(entry.key, sizeof(entry.key));
     if (key_length) {
       std::string key(entry.key, key_length);
       std::string value(entry.value, strnlen(entry.value, sizeof(entry.value)));
-      if (!simple_map_annotations->count(key)) {
-        simple_map_annotations->insert(
-            std::pair<std::string, std::string>(key, value));
-      } else {
+      if (!simple_map_annotations->insert(std::make_pair(key, value)).second) {
         LOG(INFO) << "duplicate simple annotation " << key << " in " << name_;
       }
     }
   }
 }
 
 }  // namespace crashpad