schema progress (does not compile)

include/matador/object/object_info.hpp

@@ -9,21 +9,21 @@
 namespace matador::object {
 class repository_node;
 
-template<typename Type>
-class observer_ptr {
-public:
-  explicit observer_ptr(std::unique_ptr<observer<Type>> &&observer)
-  : observer(std::move(observer)) {}
-
-  operator bool() const { return observer != nullptr; }
-
-  observer<Type> *get() const { return observer.get(); }
-  observer<Type> &operator*() const { return *observer; }
-  observer<Type> *operator->() const { return observer.get(); }
-
-private:
-  std::unique_ptr<observer<Type>> observer;
-};
+// template<typename Type>
+// class observer_ptr {
+// public:
+//   explicit observer_ptr(std::unique_ptr<observer<Type>> &&o)
+//   : observer_(std::move(o)) {}
+//
+//   operator bool() const { return observer_ != nullptr; }
+//
+//   observer<Type> *get() const { return observer_.get(); }
+//   observer<Type> &operator*() const { return *observer_; }
+//   observer<Type> *operator->() const { return observer_.get(); }
+//
+// private:
+//   std::unique_ptr<observer<Type>> observer_;
+// };
 template<typename Type>
 class object_info final : public basic_object_info {
 public:
@@ -31,10 +31,11 @@ public:
 
   object_info(const std::shared_ptr<repository_node>& node,
               std::shared_ptr<class object> &&obj,
+              std::vector<std::unique_ptr<observer<Type>>>&& observers,
               create_func&& creator)
   : basic_object_info(node, std::move(obj))
-  , creator_(std::move(creator)){
-  }
+  , creator_(std::move(creator))
+  , observers_(std::move(observers)){}
 
   explicit object_info(const std::shared_ptr<repository_node>& node)
   : basic_object_info(node, {}) {
@@ -55,13 +56,18 @@ public:
     }
   }
 
-  void register_observer(observer_ptr<Type> observer) {
+  void register_observer(std::unique_ptr<observer<Type>>&& observer) {
     observers_.push_back(std::move(observer));
   }
+
+  const std::vector<std::unique_ptr<observer<Type>>>& observers() const {
+    return observers_;
+  }
+
 private:
   Type prototype_;
   create_func creator_{[]{ return std::make_unique<Type>(); }};
-  std::vector<observer_ptr<Type>> observers_;
+  std::vector<std::unique_ptr<observer<Type>>> observers_;
 };
 
 template<typename Type>