From f14dfca941ba41fe1fc6614ccc1e42c1690b2229 Mon Sep 17 00:00:00 2001 From: Jan Travnicek <Jan.Travnicek@fit.cvut.cz> Date: Fri, 16 Nov 2018 20:04:00 +0100 Subject: [PATCH] cleanup in registrator classes --- alib2data/src/PrimitiveRegistrator.cpp | 6 +----- alib2xml/src/PrimitiveRegistrator.cpp | 9 ++------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/alib2data/src/PrimitiveRegistrator.cpp b/alib2data/src/PrimitiveRegistrator.cpp index 0e21ee4078..96a2f79315 100644 --- a/alib2data/src/PrimitiveRegistrator.cpp +++ b/alib2data/src/PrimitiveRegistrator.cpp @@ -36,17 +36,13 @@ public: abstraction::XmlComposerRegistry::registerXmlComposer < ext::vector < ext::map < std::pair < object::Object, object::Object >, ext::map < object::Object, object::Object > > > > ( ); abstraction::XmlComposerRegistry::registerXmlComposer < ext::vector < ext::vector < ext::set < object::Object > > > > ( ); abstraction::XmlComposerRegistry::registerXmlComposer < ext::map < common::ranked_symbol < object::Object, unsigned >, size_t > > ( ); + abstraction::XmlComposerRegistry::registerXmlComposer < ext::set < string::LinearString < > > > ( ); abstraction::XmlParserRegistry::registerXmlParser < object::Object > ( "DefaultStateType" ); - abstraction::XmlComposerRegistry::registerXmlComposer < ext::set < string::LinearString < > > > ( ); - core::xmlApi < object::Object >::template registerXmlWriter < ext::set < common::ranked_symbol < object::Object, unsigned > > > ( ); core::xmlApi < object::Object >::template registerXmlWriter < ext::pair < ext::set < ext::pair < object::Object, object::Object > >, ext::variant < string::Epsilon < object::Object >, object::Object > > > ( ); core::xmlApi < object::Object >::template registerXmlWriter < ext::pair < object::Object, ext::variant < string::Epsilon < object::Object >, object::Object > > > ( ); - core::xmlApi < object::Object >::template registerXmlWriter < ext::vector < ext::map < std::pair < object::Object, object::Object >, ext::map < object::Object, object::Object > > > > ( ); - core::xmlApi < object::Object >::template registerXmlWriter < ext::vector < ext::vector < ext::set < object::Object > > > > ( ); - } }; diff --git a/alib2xml/src/PrimitiveRegistrator.cpp b/alib2xml/src/PrimitiveRegistrator.cpp index f1984d7dc6..19f962aea1 100644 --- a/alib2xml/src/PrimitiveRegistrator.cpp +++ b/alib2xml/src/PrimitiveRegistrator.cpp @@ -33,11 +33,6 @@ public: abstraction::XmlParserRegistry::registerXmlParser < int > ( "int" ); abstraction::XmlParserRegistry::registerXmlParser < ext::set < ext::pair < object::Object, object::Object > > > ( "pair_set" ); - abstraction::XmlComposerRegistry::registerXmlComposer < bool > ( ); - abstraction::XmlComposerRegistry::registerXmlComposer < int > ( ); - abstraction::XmlComposerRegistry::registerXmlComposer < double > ( ); - abstraction::XmlComposerRegistry::registerXmlComposer < std::string > ( ); - abstraction::XmlComposerRegistry::registerXmlComposer < ext::vector < size_t > > ( ); abstraction::XmlComposerRegistry::registerXmlComposer < ext::vector < unsigned > > ( ); abstraction::XmlComposerRegistry::registerXmlComposer < ext::vector < int > > ( ); @@ -45,12 +40,12 @@ public: abstraction::XmlComposerRegistry::registerXmlComposer < ext::set < unsigned > > ( ); abstraction::XmlComposerRegistry::registerXmlComposer < ext::set < int > > ( ); abstraction::XmlComposerRegistry::registerXmlComposer < ext::map < object::Object, size_t > > ( ); + abstraction::XmlComposerRegistry::registerXmlComposer < object::Object > ( ); + abstraction::XmlComposerRegistry::registerXmlComposer < ext::set < object::Object > > ( ); abstraction::ContainerRegistry::registerSet < object::Object > ( "Object" ); abstraction::XmlContainerParserRegistry::registerSet < object::Object > ( "Object" ); abstraction::XmlParserRegistry::registerXmlParser < object::Object > ( "Object" ); - abstraction::XmlComposerRegistry::registerXmlComposer < object::Object > ( ); - abstraction::XmlComposerRegistry::registerXmlComposer < ext::set < object::Object > > ( ); core::xmlApi < object::Object >::template registerXmlWriter < ext::set < ext::pair < object::Object, object::Object > > > ( ); core::xmlApi < object::Object >::template registerXmlWriter < ext::pair < ext::set < ext::pair < object::Object, object::Object > >, object::Object > > ( ); -- GitLab