odb: dbObjectTable minor cleanup

Signed-off-by: Matt Liberty <[email protected]>

Author: maliberty

src/odb/include/odb/dbIterator.h

@@ -3,18 +3,17 @@
 
 #pragma once
 
-#include <iterator>
-
 #include "odb/odb.h"
 
 namespace odb {
 
 class dbObject;
-class dbObjectTable;
 
 class dbIterator
 {
  public:
+  virtual ~dbIterator() = default;
+
   virtual bool reversible() const = 0;
   virtual bool orderReversed() const = 0;
   virtual void reverse(dbObject* parent) = 0;
@@ -24,7 +23,6 @@ class dbIterator
   virtual uint end(dbObject* parent) const = 0;
   virtual uint next(uint id, ...) const = 0;
   virtual dbObject* getObject(uint id, ...) = 0;
-  virtual ~dbIterator() = default;
 };
 
 }  // namespace odb

src/odb/include/odb/dbSet.h

@@ -27,7 +27,7 @@ class dbSetIterator
   using reference = T*&;
   using iterator_category = std::input_iterator_tag;
 
-  dbSetIterator();
+  dbSetIterator() = default;
   dbSetIterator(const dbSetIterator& it) = default;
 
   bool operator==(const dbSetIterator<T>& it) const;
@@ -41,8 +41,8 @@ class dbSetIterator
  private:
   dbSetIterator(dbIterator* itr, uint id);
 
-  dbIterator* itr_;
-  uint cur_;
+  dbIterator* itr_{nullptr};
+  uint cur_{0};
 
   friend class dbSet<T>;
 };
@@ -75,38 +75,30 @@ class dbSet
  public:
   using iterator = dbSetIterator<T>;
 
-  dbSet()
-  {
-    itr_ = nullptr;
-    parent_ = nullptr;
-  }
+  dbSet() = default;
 
   dbSet(dbObject* parent, dbIterator* itr)
   {
     parent_ = parent;
     itr_ = itr;
   }
 
-  dbSet(const dbSet<T>& c)
-  {
-    itr_ = c.itr_;
-    parent_ = c.parent_;
-  }
+  dbSet(const dbSet<T>& c) = default;
 
   ///
   /// Returns the number of items in this set.
   ///
-  uint size() { return itr_->size(parent_); }
+  uint size() const { return itr_->size(parent_); }
 
   ///
   /// Return a begin() iterator.
   ///
-  iterator begin() { return iterator(itr_, itr_->begin(parent_)); }
+  iterator begin() const { return iterator(itr_, itr_->begin(parent_)); }
 
   ///
   /// Return an end() iterator.
   ///
-  iterator end() { return iterator(itr_, itr_->end(parent_)); }
+  iterator end() const { return iterator(itr_, itr_->end(parent_)); }
 
   ///
   /// If this set is sequential, this function will return the database
@@ -117,18 +109,18 @@ class dbSet
   ///
   /// If this set is non-sequential then it returns 0.
   ///
-  uint sequential() { return itr_->sequential(); }
+  uint sequential() const { return itr_->sequential(); }
 
   ///
   /// Returns true if this set is reversible.
   ///
-  bool reversible() { return itr_->reversible(); }
+  bool reversible() const { return itr_->reversible(); }
 
   ///
   /// Returns true if the is iterated in the reverse order that
   /// it was created.
   ///
-  bool orderReversed() { return itr_->orderReversed(); }
+  bool orderReversed() const { return itr_->orderReversed(); }
 
   ///
   /// Reverse the order of this set.
@@ -138,20 +130,13 @@ class dbSet
   ///
   /// Returns true if set is empty
   ///
-  bool empty() { return begin() == end(); }
+  bool empty() const { return begin() == end(); }
 
  private:
-  dbIterator* itr_;
-  dbObject* parent_;
+  dbIterator* itr_{nullptr};
+  dbObject* parent_{nullptr};
 };
 
-template <class T>
-inline dbSetIterator<T>::dbSetIterator()
-{
-  itr_ = nullptr;
-  cur_ = 0;
-}
-
 template <class T>
 inline dbSetIterator<T>::dbSetIterator(dbIterator* itr, uint id)
 {