From: Justin Viiret <justin.viiret@intel.com>
Date: Fri, 20 Jan 2017 05:17:48 +0000 (+1100)
Subject: flat_base: take more common operations
X-Git-Tag: v4.5.0^2~296
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f8166fac25cbbe08bfe4b1b29df3e2cf9789240a;p=thirdparty%2Fvectorscan.git

flat_base: take more common operations
---

diff --git a/src/util/ue2_containers.h b/src/util/ue2_containers.h
index 3e0d1555..43376a0f 100644
--- a/src/util/ue2_containers.h
+++ b/src/util/ue2_containers.h
@@ -125,6 +125,18 @@ public:
     key_compare key_comp() const {
         return comp();
     }
+
+    // Capacity.
+
+    bool empty() const { return data().empty(); }
+    size_t size() const { return data().size(); }
+    size_t max_size() const { return data().max_size(); }
+
+    // Modifiers.
+
+    void clear() {
+        data().clear();
+    }
 };
 
 } // namespace flat_detail
@@ -221,18 +233,8 @@ public:
     }
     const_reverse_iterator rend() const { return crend(); }
 
-    // Capacity.
-
-    bool empty() const { return data().empty(); }
-    size_t size() const { return data().size(); }
-    size_t max_size() const { return data().max_size(); }
-
     // Modifiers.
 
-    void clear() {
-        data().clear();
-    }
-
     std::pair<iterator, bool> insert(const value_type &value) {
         auto it = std::lower_bound(data().begin(), data().end(), value, comp());
         if (it == data().end() || comp()(value, *it)) {
@@ -442,12 +444,6 @@ public:
     }
     const_reverse_iterator rend() const { return crend(); }
 
-    // Capacity.
-
-    bool empty() const { return data().empty(); }
-    size_t size() const { return data().size(); }
-    size_t max_size() const { return data().max_size(); }
-
 private:
     using storage_iterator = typename storage_type::iterator;
     using storage_const_iterator = typename storage_type::const_iterator;
@@ -504,10 +500,6 @@ private:
 public:
     // Modifiers.
 
-    void clear() {
-        data().clear();
-    }
-
     std::pair<iterator, bool> insert(const value_type &value) {
         auto rv = data_insert(value);
         return std::make_pair(iterator(rv.first), rv.second);