Use references and clean up a bit

diff --git a/source/base/subscriptor.cc b/source/base/subscriptor.cc
index 973e5d2e1f37fe5abe8d57b5cd7f309ccd5dc975..9aa36568458ee83119060d64c55a5a97472859e4 100644 (file)
--- a/source/base/subscriptor.cc
+++ b/source/base/subscriptor.cc
@@ -136,13 +136,9 @@ Subscriptor::subscribe(std::atomic<bool> *const validity,
     object_info = &typeid(*this);
   ++counter;
 
-  const std::string name = (!id.empty()) ? id : unknown_subscriber;
+  const std::string &name = id.empty() ? unknown_subscriber : id;
 
-  map_iterator it = counter_map.find(name);
-  if (it == counter_map.end())
-    counter_map.insert(map_value_type(name, 1U));
-  else
-    it->second++;
+  ++counter_map[name];
 
   *validity = true;
   validity_pointers.push_back(validity);
@@ -154,7 +150,8 @@ void
 Subscriptor::unsubscribe(std::atomic<bool> *const validity,
                          const std::string &      id) const
 {
-  const std::string name = (!id.empty()) ? id : unknown_subscriber;
+  const std::string &name = id.empty() ? unknown_subscriber : id;
+
   if (counter == 0)
     {
       AssertNothrow(counter > 0, ExcNoSubscriber(object_info->name(), name));