Make the condition for compact inlinable.

vrpn · Jun 23, 2015 · 74b2428 · 74b2428
1 parent a40d9b7
commit 74b2428
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 9 deletions.
diff --git a/vrpn_EndpointContainer.C b/vrpn_EndpointContainer.C
@@ -77,16 +77,14 @@ namespace vrpn {
         container_.clear();
     }
 
-    void EndpointContainer::compact()
+    void EndpointContainer::compact_()
     {
-        if (needsCompact_) {
-            size_type before = get_full_container_size();
-            raw_iterator it = std::remove(begin_(), end_(), getNullEndpoint());
-            container_.resize(it - begin_());
-            needsCompact_ = false;
-            VRPN_EC_TRACE("Compact complete: was "
-                          << before << ", now " << get_full_container_size());
-        }
+        size_type before = get_full_container_size();
+        raw_iterator it = std::remove(begin_(), end_(), getNullEndpoint());
+        container_.resize(it - begin_());
+        needsCompact_ = false;
+        VRPN_EC_TRACE("Compact complete: was " << before << ", now "
+                                               << get_full_container_size());
     }
 
     bool EndpointContainer::full() const

diff --git a/vrpn_EndpointContainer.h b/vrpn_EndpointContainer.h
@@ -131,6 +131,8 @@ namespace vrpn {
         /// @{
         /// @brief Implementation of acquire for the stored pointer type.
         void acquire_(pointer endpoint);
+        /// @brief Do actual compact once we've determined it's necessary.
+        void compact_();
 
         /// @}
         container_type container_;
@@ -331,12 +333,22 @@ namespace vrpn {
         }
         return container_[i];
     }
+
     inline EndpointContainer::size_type
     EndpointContainer::get_full_container_size() const
     {
         return container_.size();
     }
 
+    // making this condition inline so that it has minimal overhead if
+    // we don't actually need to perform a compaction.
+    inline void EndpointContainer::compact()
+    {
+        if (needsCompact_) {
+            compact_();
+        }
+    }
+
     inline EndpointIterator EndpointContainer::begin() const
     {
         return EndpointIterator(*this);