commit e4b2238b33c05d491257ea418498b4c5fcca2268
author Davide Pesavento <davide.pesavento@lip6.fr> Sun Jun 10 14:37:24 2018 -0400
committer Davide Pesavento <davide.pesavento@lip6.fr> Mon Jun 11 20:26:47 2018 -0400
tree 61dfdddb6cc16fd7f2a10ac96cc5c8a41bcc3868
parent 17057444687d94dc976789ccc14294036332bb0d

Improve and simplify code with modern C++ features

Change-Id: I83bf5513c2a1f90ba5a59e93c473306864b27d94

daemon/fw/asf-measurements.hpp

diff --git a/daemon/fw/asf-measurements.hpp b/daemon/fw/asf-measurements.hpp
index ee5885d..b5b1f8e 100644
--- a/daemon/fw/asf-measurements.hpp
+++ b/daemon/fw/asf-measurements.hpp
@@ -254,8 +254,7 @@
   const FaceInfoTable::iterator
   insert(FaceId faceId)
   {
-    const auto& pair = m_fit.insert(std::make_pair(faceId, FaceInfo()));
-    return pair.first;
+    return m_fit.emplace(faceId, FaceInfo()).first;
   }
 
   bool
@@ -317,7 +316,7 @@
   extendLifetime(measurements::Entry& me);
 
 public:
-  static constexpr time::microseconds MEASUREMENTS_LIFETIME = time::seconds(300);
+  static constexpr time::microseconds MEASUREMENTS_LIFETIME = 300_s;
 
 private:
   MeasurementsAccessor& m_measurements;