diff --git a/alib2data/src/label/FailStateLabel.h b/alib2data/src/label/FailStateLabel.h index d1df218fc96b0dc832a3c29b8efeaea87ede574a..3a1b730be08ade86148824e3e0842472ef210474 100644 --- a/alib2data/src/label/FailStateLabel.h +++ b/alib2data/src/label/FailStateLabel.h @@ -25,7 +25,6 @@ #define FAIL_STATE_LABEL_H_ #include "LabelBase.h" -#include "Label.h" #include <object/Object.h> namespace label { @@ -113,11 +112,6 @@ inline FailStateLabel FailStateLabel::instance < FailStateLabel > ( ) { return FailStateLabel ( ); } -template < > -inline Label FailStateLabel::instance < Label > ( ) { - return Label ( FailStateLabel ( ) ); -} - template < > inline object::Object FailStateLabel::instance < object::Object > ( ) { return object::Object ( FailStateLabel ( ) ); diff --git a/alib2data/src/label/FinalStateLabel.h b/alib2data/src/label/FinalStateLabel.h index a1023985e3a75dc239cba8f1f5a9bbc15012c52a..d76e3e30047e5af68876bad82cd32cd84b702982 100644 --- a/alib2data/src/label/FinalStateLabel.h +++ b/alib2data/src/label/FinalStateLabel.h @@ -25,7 +25,6 @@ #define FINAL_STATE_LABEL_H_ #include "LabelBase.h" -#include "Label.h" #include <object/Object.h> namespace label { @@ -113,11 +112,6 @@ inline FinalStateLabel FinalStateLabel::instance < FinalStateLabel > ( ) { return FinalStateLabel ( ); } -template < > -inline Label FinalStateLabel::instance < Label > ( ) { - return Label ( FinalStateLabel ( ) ); -} - template < > inline object::Object FinalStateLabel::instance < object::Object > ( ) { return object::Object ( FinalStateLabel ( ) ); diff --git a/alib2data/src/label/InitialStateLabel.h b/alib2data/src/label/InitialStateLabel.h index 30aca140626963ea9cf9e1035ceef7bb9a990885..24ef3130673fc203b580b9f3c5a3846ae84a6e03 100644 --- a/alib2data/src/label/InitialStateLabel.h +++ b/alib2data/src/label/InitialStateLabel.h @@ -25,7 +25,6 @@ #define INITIAL_STATE_LABEL_H_ #include "LabelBase.h" -#include "Label.h" #include <object/Object.h> namespace label { @@ -113,11 +112,6 @@ inline InitialStateLabel InitialStateLabel::instance < InitialStateLabel > ( ) { return InitialStateLabel ( ); } -template < > -inline Label InitialStateLabel::instance < Label > ( ) { - return Label ( InitialStateLabel ( ) ); -} - template < > inline object::Object InitialStateLabel::instance < object::Object > ( ) { return object::Object ( InitialStateLabel ( ) ); diff --git a/alib2data/src/label/Label.h b/alib2data/src/label/Label.h deleted file mode 100644 index 3cbd5546ba8061a5c012afdd8464e4f15b2e31f6..0000000000000000000000000000000000000000 --- a/alib2data/src/label/Label.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Label.h - * - * Created on: Apr 10, 2013 - * Author: Jan Travnicek - */ - -#ifndef LABEL_H_ -#define LABEL_H_ - -#include <base/WrapperBase.hpp> -#include "LabelBase.h" - -namespace label { - -/** - * Wrapper around automata. - */ -class Label : public base::WrapperBase < LabelBase > { - using base::WrapperBase < LabelBase >::WrapperBase; - -}; - -} /* namespace label */ - -#endif /* LABEL_H_ */ diff --git a/alib2data/src/label/xml/FailStateLabel.cpp b/alib2data/src/label/xml/FailStateLabel.cpp index 9127098fa094fd7c722a143297f55dd0acb9778c..b7e66cefb4236de483b5901f441e96f96056db05 100644 --- a/alib2data/src/label/xml/FailStateLabel.cpp +++ b/alib2data/src/label/xml/FailStateLabel.cpp @@ -6,7 +6,6 @@ */ #include "FailStateLabel.h" -#include <label/Label.h> #include <object/Object.h> #include <registration/XmlRegistration.hpp> @@ -41,7 +40,6 @@ namespace { static auto xmlWrite = registration::XmlWriterRegister < label::FailStateLabel > ( ); static auto xmlRead = registration::XmlReaderRegister < label::FailStateLabel > ( ); -static auto xmlGroup1 = registration::XmlRegisterTypeInGroup < label::Label, label::FailStateLabel > ( ); -static auto xmlGroup2 = registration::XmlRegisterTypeInGroup < object::Object, label::FailStateLabel > ( ); +static auto xmlGroup = registration::XmlRegisterTypeInGroup < object::Object, label::FailStateLabel > ( ); } /* namespace */ diff --git a/alib2data/src/label/xml/FinalStateLabel.cpp b/alib2data/src/label/xml/FinalStateLabel.cpp index 2930a3792a78ae95414b7a35c960f3c31951d8e7..74fc0c8afe7d3348e7a1c7ff328a6c57be634468 100644 --- a/alib2data/src/label/xml/FinalStateLabel.cpp +++ b/alib2data/src/label/xml/FinalStateLabel.cpp @@ -6,7 +6,6 @@ */ #include "FinalStateLabel.h" -#include <label/Label.h> #include <object/Object.h> #include <registration/XmlRegistration.hpp> @@ -41,7 +40,6 @@ namespace { static auto xmlWrite = registration::XmlWriterRegister < label::FinalStateLabel > ( ); static auto xmlRead = registration::XmlReaderRegister < label::FinalStateLabel > ( ); -static auto xmlGroup1 = registration::XmlRegisterTypeInGroup < label::Label, label::FinalStateLabel > ( ); -static auto xmlGroup2 = registration::XmlRegisterTypeInGroup < object::Object, label::FinalStateLabel > ( ); +static auto xmlGroup = registration::XmlRegisterTypeInGroup < object::Object, label::FinalStateLabel > ( ); } /* namespace */ diff --git a/alib2data/src/label/xml/InitialStateLabel.cpp b/alib2data/src/label/xml/InitialStateLabel.cpp index 9f867faa6db3037bbb9c5096a381a296c3a16184..24c35be08f044a644a89a999ec267889acfb8aac 100644 --- a/alib2data/src/label/xml/InitialStateLabel.cpp +++ b/alib2data/src/label/xml/InitialStateLabel.cpp @@ -6,7 +6,6 @@ */ #include "InitialStateLabel.h" -#include <label/Label.h> #include <object/Object.h> #include <registration/XmlRegistration.hpp> @@ -41,7 +40,6 @@ namespace { static auto xmlWrite = registration::XmlWriterRegister < label::InitialStateLabel > ( ); static auto xmlRead = registration::XmlReaderRegister < label::InitialStateLabel > ( ); -static auto xmlGroup1 = registration::XmlRegisterTypeInGroup < label::Label, label::InitialStateLabel > ( ); -static auto xmlGroup2 = registration::XmlRegisterTypeInGroup < object::Object, label::InitialStateLabel > ( ); +static auto xmlGroup = registration::XmlRegisterTypeInGroup < object::Object, label::InitialStateLabel > ( ); } /* namespace */ diff --git a/alib2str/src/label/string/FailStateLabel.cpp b/alib2str/src/label/string/FailStateLabel.cpp index e81fa18eaa6417b2dc0ea04409548f04a371b4e5..e989c59cb654b6c7c59157ae4c8065a37e3412eb 100644 --- a/alib2str/src/label/string/FailStateLabel.cpp +++ b/alib2str/src/label/string/FailStateLabel.cpp @@ -9,7 +9,6 @@ #include <label/FailStateLabel.h> #include <primitive/string/String.h> #include <object/Object.h> -#include <label/Label.h> #include <registration/StringRegistration.hpp> @@ -31,7 +30,6 @@ void stringApi < label::FailStateLabel >::compose ( std::ostream & output, const namespace { -static auto stringWrite = registration::StringWriterRegister < label::Label, label::FailStateLabel > ( ); -static auto stringWrite2 = registration::StringWriterRegister < object::Object, label::FailStateLabel > ( ); +static auto stringWrite = registration::StringWriterRegister < object::Object, label::FailStateLabel > ( ); } /* namespace */ diff --git a/alib2str/src/label/string/FinalStateLabel.cpp b/alib2str/src/label/string/FinalStateLabel.cpp index 066856dae8aba13d1b6d66ee16c9a2756fa5da1e..f3234afd869e5ad5c4dffc612db6668aa151492b 100644 --- a/alib2str/src/label/string/FinalStateLabel.cpp +++ b/alib2str/src/label/string/FinalStateLabel.cpp @@ -9,7 +9,6 @@ #include <label/FinalStateLabel.h> #include <primitive/string/String.h> #include <object/Object.h> -#include <label/Label.h> #include <registration/StringRegistration.hpp> @@ -31,7 +30,6 @@ void stringApi < label::FinalStateLabel >::compose ( std::ostream & output, cons namespace { -static auto stringWrite = registration::StringWriterRegister < label::Label, label::FinalStateLabel > ( ); -static auto stringWrite2 = registration::StringWriterRegister < object::Object, label::FinalStateLabel > ( ); +static auto stringWrite = registration::StringWriterRegister < object::Object, label::FinalStateLabel > ( ); } /* namespace */ diff --git a/alib2str/src/label/string/InitialStateLabel.cpp b/alib2str/src/label/string/InitialStateLabel.cpp index 9d1d3e209715a0a79d35940660bbd634c5154f5c..762bd3563c15959686a63ff75da34f1ed5f897d9 100644 --- a/alib2str/src/label/string/InitialStateLabel.cpp +++ b/alib2str/src/label/string/InitialStateLabel.cpp @@ -9,7 +9,6 @@ #include <label/InitialStateLabel.h> #include <primitive/string/String.h> #include <object/Object.h> -#include <label/Label.h> #include <registration/StringRegistration.hpp> @@ -31,7 +30,6 @@ void stringApi < label::InitialStateLabel >::compose ( std::ostream & output, co namespace { -static auto stringWrite = registration::StringWriterRegister < label::Label, label::InitialStateLabel > ( ); -static auto stringWrite2 = registration::StringWriterRegister < object::Object, label::InitialStateLabel > ( ); +static auto stringWrite = registration::StringWriterRegister < object::Object, label::InitialStateLabel > ( ); } /* namespace */ diff --git a/alib2str/test-src/object/ObjectTest.cpp b/alib2str/test-src/object/ObjectTest.cpp index 827f2b1c37f721105d1c4920b240a68fd87d63fa..cac78af90151784ddde0e51a6e9f1c05c1343ca7 100644 --- a/alib2str/test-src/object/ObjectTest.cpp +++ b/alib2str/test-src/object/ObjectTest.cpp @@ -1,6 +1,5 @@ #include "ObjectTest.h" -#include <label/Label.h> #include <object/Object.h> #include <factory/StringDataFactory.hpp>