Fixes for 'make UNATTENDED=yes CC=clang CXX=clang verify'

Change-Id: I994649761fe2e66e12ae0e49a84fb1d0a966ddfb
Signed-off-by: Neale Ranns <nranns@cisco.com>

1 files changed, 3 insertions, 13 deletions

diff --git a/src/vpp-api/vom/singular_db.hpp b/src/vpp-api/vom/singular_db.hpp
index 07ea2cb4acf..afca9a3509e 100644
--- a/src/vpp-api/vom/singular_db.hpp
+++ b/src/vpp-api/vom/singular_db.hpp
@@ -16,6 +16,7 @@
 #ifndef __VOM_INST_DB_H__
 #define __VOM_INST_DB_H__
 
+#include <map>
 #include <memory>
 #include <ostream>
 
@@ -46,12 +47,12 @@ public:
   /**
    * Get iterator to the beginning of the DB
    */
-  const_iterator cbegin() { return m_map.cbegin(); }
+  const_iterator begin() const { return m_map.cbegin(); }
 
   /**
    * Get iterator to the beginning of the DB
    */
-  const_iterator cend() { return m_map.cend(); }
+  const_iterator end() const { return m_map.cend(); }
 
   /**
    * Find or add the object to the store.
@@ -119,17 +120,6 @@ public:
   void add(const KEY& key, std::shared_ptr<OBJ> sp) { m_map[key] = sp; }
 
   /**
-   * Print each of the object in the DB into the stream provided
-   */
-  void dump(std::ostream& os)
-  {
-    for (auto entry : m_map) {
-      os << "key: " << entry.first << std::endl;
-      os << "  " << entry.second.lock()->to_string() << std::endl;
-    }
-  }
-
-  /**
    * Populate VPP from current state, on VPP restart
    */
   void replay()