diff --git a/alib2common/src/PrimitiveRegistrator.cpp b/alib2common/src/PrimitiveRegistrator.cpp index dea11c98290869712237628b00233c1a42446276..5cf0e2545a0cc1e6ab9e698ae14f423bdd7814b3 100644 --- a/alib2common/src/PrimitiveRegistrator.cpp +++ b/alib2common/src/PrimitiveRegistrator.cpp @@ -60,37 +60,21 @@ public: abstraction::ValuePrinterRegistry::registerValuePrinter < object::Object > ( ); abstraction::ValuePrinterRegistry::registerValuePrinter < ext::set < object::Object > > ( ); abstraction::ValuePrinterRegistry::registerValuePrinter < ext::set < unsigned > > ( ); - abstraction::ValuePrinterRegistry::registerValuePrinter<ext::vector<object::Object> >(); - abstraction::ValuePrinterRegistry::registerValuePrinter<ext::vector<ext::pair<object::Object, - object::Object> > >(); - abstraction::ValuePrinterRegistry::registerValuePrinter<ext::pair<ext::vector<object::Object>, double> >(); - abstraction::ValuePrinterRegistry::registerValuePrinter<ext::pair<ext::vector<object::Object>, int> >(); - abstraction::ValuePrinterRegistry::registerValuePrinter<ext::pair<ext::vector<object::Object>, long> >(); - abstraction::ValuePrinterRegistry::registerValuePrinter<ext::pair<ext::vector<ext::pair<object::Object, - object::Object> >, - double> >(); - abstraction::ValuePrinterRegistry::registerValuePrinter<ext::pair<ext::vector<ext::pair<object::Object, - object::Object> >, - int> >(); - abstraction::ValuePrinterRegistry::registerValuePrinter<ext::pair<ext::vector<ext::pair<object::Object, - object::Object> >, - long> >(); - abstraction::ValuePrinterRegistry::registerValuePrinter<ext::map<object::Object, - ext::map<object::Object, double> > >(); - abstraction::ValuePrinterRegistry::registerValuePrinter<ext::map<object::Object, - ext::map<object::Object, int> > >(); - abstraction::ValuePrinterRegistry::registerValuePrinter<ext::map<object::Object, - ext::map<object::Object, long> > >(); - abstraction::ValuePrinterRegistry::registerValuePrinter<ext::map<ext::pair<object::Object, object::Object>, - ext::map<ext::pair<object::Object, - object::Object>, - double> > >(); - abstraction::ValuePrinterRegistry::registerValuePrinter<ext::map<ext::pair<object::Object, object::Object>, - ext::map<ext::pair<object::Object, - object::Object>, int> > >(); - abstraction::ValuePrinterRegistry::registerValuePrinter<ext::map<ext::pair<object::Object, object::Object>, - ext::map<ext::pair<object::Object, - object::Object>, long> > >(); + + abstraction::ValuePrinterRegistry::registerValuePrinter < ext::vector < object::Object > > ( ); + abstraction::ValuePrinterRegistry::registerValuePrinter < ext::vector < ext::pair < object::Object, object::Object > > > ( ); + abstraction::ValuePrinterRegistry::registerValuePrinter < ext::pair < ext::vector < object::Object >, double > > ( ); + abstraction::ValuePrinterRegistry::registerValuePrinter < ext::pair < ext::vector < object::Object >, int > > ( ); + abstraction::ValuePrinterRegistry::registerValuePrinter < ext::pair < ext::vector < object::Object >, long > > ( ); + abstraction::ValuePrinterRegistry::registerValuePrinter < ext::pair < ext::vector < ext::pair < object::Object, object::Object > >, double > > ( ); + abstraction::ValuePrinterRegistry::registerValuePrinter < ext::pair < ext::vector < ext::pair < object::Object, object::Object > >, int > > ( ); + abstraction::ValuePrinterRegistry::registerValuePrinter < ext::pair < ext::vector < ext::pair < object::Object, object::Object > >, long > > ( ); + abstraction::ValuePrinterRegistry::registerValuePrinter < ext::map < object::Object, ext::map < object::Object, double > > > ( ); + abstraction::ValuePrinterRegistry::registerValuePrinter < ext::map < object::Object, ext::map < object::Object, int > > > ( ); + abstraction::ValuePrinterRegistry::registerValuePrinter < ext::map < object::Object, ext::map < object::Object, long > > > ( ); + abstraction::ValuePrinterRegistry::registerValuePrinter < ext::map < ext::pair < object::Object, object::Object >, ext::map < ext::pair < object::Object, object::Object >, double > > > ( ); + abstraction::ValuePrinterRegistry::registerValuePrinter < ext::map < ext::pair < object::Object, object::Object >, ext::map < ext::pair < object::Object, object::Object >, int > > > ( ); + abstraction::ValuePrinterRegistry::registerValuePrinter < ext::map < ext::pair < object::Object, object::Object >, ext::map < ext::pair < object::Object, object::Object >, long > > > ( ); abstraction::ContainerRegistry::registerSet < object::Object > ( ); } }; diff --git a/alib2data/src/PrimitiveRegistrator.cpp b/alib2data/src/PrimitiveRegistrator.cpp index d335bdd894962cb9e9ada14ec06873a36448ded1..deb77c088d9bb683abc949520c9b8c9f24e6de34 100644 --- a/alib2data/src/PrimitiveRegistrator.cpp +++ b/alib2data/src/PrimitiveRegistrator.cpp @@ -79,7 +79,6 @@ public: core::xmlApi < object::Object >::template registerXmlWriter < object::AnyObject < ext::pair < unsigned int, unsigned int > > > ( ); core::xmlApi < object::Object >::template registerXmlWriter < object::AnyObject < ext::pair < object::Object, object::Object > > > ( ); core::xmlApi < object::Object >::template registerXmlWriter < object::AnyObject < ext::set < char > > > ( ); - } };