optimize includes of objects

alib2data/src/XmlApi.cpp

@@ -33,6 +33,8 @@
 #include "primitive/String.h"
 #include "primitive/Character.h"
+#include "object/Void.h"
+
 namespace alib {
 const label::LabelFromXMLParser FromXMLParsers::labelParser;

alib2data/src/object/Object.h

@@ -8,20 +8,28 @@
 #ifndef OBJECT_H_
 #define OBJECT_H_
+#include "ObjectBase.h"
 #include "../common/wrapper.hpp"
 namespace alib {
-class ObjectBase;
-
 /**
  * Wrapper around object.
  */
-typedef alib::wrapper<ObjectBase> Object;
-} /* namespace alib */
-#include "ObjectBase.h"
+class Object : public alib::wrapper<ObjectBase> {
+public:
+	explicit Object(ObjectBase* data) : alib::wrapper<ObjectBase>(data) {
+	}
+	explicit Object(const ObjectBase& data) : alib::wrapper<ObjectBase>(data.clone()) {
+	}
+	explicit Object(ObjectBase&& data) : alib::wrapper<ObjectBase>(std::move(data).plunder()) {
+	}
+
+};
+
+} /* namespace alib */
 namespace std {

alib2data/src/object/ObjectBase.h

@@ -13,11 +13,9 @@
 #include <memory>
 #include "../common/base.hpp"
-namespace alib {
-class Void;
-}
+#include "ObjectFeatures.h"
 namespace exception {
@@ -121,8 +119,6 @@ namespace alib {
 // ----------------------------------------------------------------------------------------------------------------------
-class ObjectBase;
-
 typedef std::tuple< tree::RankedTree, tree::RankedPattern, tree::PrefixRankedTree, tree::PrefixRankedBarTree, tree::PrefixRankedPattern, tree::PrefixRankedBarPattern, tree::UnrankedTree, tree::UnrankedPattern
 	> TreeTypes;
@@ -174,6 +170,8 @@ typedef types_merger<TreeTypes, PrimitiveTypes, ContainerTypes, SymbolTypes, Str
 // ----------------------------------------------------------------------------------------------------------------------
+class ObjectBase;
+
 template<typename T>
 class acceptor_base_helper {
 };

alib2data/src/object/ObjectFeatures.h

+/*
+ * ObjectFeatures.h
+ *
+ *  Created on: Jun 19, 2014
+ *      Author: Jan Travnicek
+ */
+
+#ifndef OBJECT_FEATURES_H_
+#define OBJECT_FEATURES_H_
+
+namespace alib {
+
+enum class FEATURES {
+	VOID
+};
+
+class Object;
+
+class Void;
+
+} /* namespace alib */
+
+#endif /* OBJECT_FEATURES_H_ */

alib2data/src/object/ObjectFromXMLParser.cpp

@@ -6,11 +6,11 @@
  */
 #include "ObjectFromXMLParser.h"
-
 #include "../sax/ParserException.h"
-
 #include "../XmlApi.hpp"
-#include <iostream>
+
+#include "Object.h"
+#include "Void.h"
 namespace alib {

alib2data/src/object/ObjectFromXMLParser.h

@@ -10,9 +10,8 @@
 #include "../sax/FromXMLParserHelper.h"
 #include <set>
-#include "Object.h"
+#include "ObjectFeatures.h"
 #include "../sax/Token.h"
-#include "../label/Label.h"
 namespace alib {

alib2data/src/object/ObjectToXMLComposer.cpp

@@ -9,6 +9,9 @@
 #include "../XmlApi.hpp"
+#include "Object.h"
+#include "Void.h"
+
 namespace alib {
 void ObjectToXMLComposer::compose(std::deque<sax::Token>& out, const Object& object) const {

alib2data/src/object/ObjectToXMLComposer.h

@@ -10,9 +10,7 @@
 #include <deque>
 #include "Object.h"
-#include "Void.h"
 #include "../sax/Token.h"
-#include "../label/Label.h"
 namespace alib {