Merge branch 'master' into 79-fix-easy-json-export-with-untyped-data

source/RobotAPI/libraries/aron/core/codegenerator/codewriter/cpp/generator/Generator.cpp

@@ -211,7 +211,7 @@ namespace armarx::aron::codegenerator::cpp
 
         CppMethodPtr m = CppMethodPtr(new CppMethod("template<class WriterT>\nstatic typename WriterT::ReturnType writeType(WriterT& " + ARON_WRITER_ACCESSOR + ", std::vector<std::string> " + ARON_TEMPLATE_INSTANTIATIONS_ACCESSOR + " = {}, armarx::aron::type::Maybe "+ ARON_MAYBE_TYPE_ACCESSOR +" = armarx::aron::type::Maybe::eNone, const armarx::aron::Path& "+ARON_PATH_ACCESSOR+" = armarx::aron::Path())", doc.str()));
         CppBlockPtr b = std::make_shared<CppBlock>();
-        b->addLine("using T = typename WriterT::ReturnType;");
+        b->addLine("using T [[maybe_unused]] = typename WriterT::ReturnType;");
 
         std::string dummy;
         b->appendBlock(this->getWriteTypeBlock("", "", Path(), dummy));
@@ -228,7 +228,7 @@ namespace armarx::aron::codegenerator::cpp
 
         CppMethodPtr m = CppMethodPtr(new CppMethod("template<class WriterT>\ntypename WriterT::ReturnType write(WriterT& " + ARON_WRITER_ACCESSOR + ", const armarx::aron::Path& "+ARON_PATH_ACCESSOR+" = armarx::aron::Path()) const", doc.str()));
         CppBlockPtr b = std::make_shared<CppBlock>();
-        b->addLine("using T = typename WriterT::ReturnType;");
+        b->addLine("using T [[maybe_unused]] = typename WriterT::ReturnType;");
 
         std::string dummy;
         b->appendBlock(this->getWriteBlock("", Path(), dummy));
@@ -245,20 +245,8 @@ namespace armarx::aron::codegenerator::cpp
 
         CppMethodPtr m = CppMethodPtr(new CppMethod("template<class ReaderT>\nvoid read(ReaderT& " + ARON_READER_ACCESSOR + ", typename ReaderT::InputType& input)", doc.str()));
         CppBlockPtr b = std::make_shared<CppBlock>();
-        b->addLine("using T = typename ReaderT::InputType;");
-        b->addLine("using TNonConst = typename ReaderT::InputTypeNonConst;");
-
-        // TODO: Remove me and make nice
-        auto makeSuppressUnusedBlock = []()
-        {
-            auto block = std::make_shared<CppBlock>();
-            block->addLine("const T* _suppressUnusedWarning1;");
-            block->addLine("const TNonConst* _suppressUnusedWarning2;");
-            block->addLine("(void) _suppressUnusedWarning1;");
-            block->addLine("(void) _suppressUnusedWarning2;");
-            return block;
-        };
-        b->addBlock(makeSuppressUnusedBlock());
+        b->addLine("using T [[maybe_unused]] = typename ReaderT::InputType;");
+        b->addLine("using TNonConst [[maybe_unused]] = typename ReaderT::InputTypeNonConst;");
 
         b->addLine("this->resetSoft();");
         b->addLine("if (" + ARON_READER_ACCESSOR + ".readNull(input))");