From 6f7489cd6ceb832d4cf7019de2b03fadb3917b86 Mon Sep 17 00:00:00 2001
From: Rainer Kartmann <rainer.kartmann@kit.edu>
Date: Fri, 17 Sep 2021 09:28:07 +0200
Subject: [PATCH] Fix undefined reference to aron enums (triggered in
armem_skills)
---
.../codeWriter/cpp/serializer/toplevel/IntEnumClass.cpp | 2 +-
.../codeWriter/cpp/serializer/toplevel/IntEnumClass.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/source/RobotAPI/libraries/aron/core/codegenerator/codeWriter/cpp/serializer/toplevel/IntEnumClass.cpp b/source/RobotAPI/libraries/aron/core/codegenerator/codeWriter/cpp/serializer/toplevel/IntEnumClass.cpp
index 0db5f2d68..5f3c8043a 100644
--- a/source/RobotAPI/libraries/aron/core/codegenerator/codeWriter/cpp/serializer/toplevel/IntEnumClass.cpp
+++ b/source/RobotAPI/libraries/aron/core/codegenerator/codeWriter/cpp/serializer/toplevel/IntEnumClass.cpp
@@ -59,7 +59,7 @@ namespace armarx::aron::cppserializer::serializer
for (const auto& [key, value] : typenavigator->getAcceptedValueMap())
{
std::string enumKeyWithNamespace = std::string(IMPL_ENUM) + "::" + key;
- fields.push_back(std::make_shared<CppField>("const static " + std::string(IMPL_ENUM), key + " = " + enumKeyWithNamespace));
+ fields.push_back(std::make_shared<CppField>("static constexpr " + std::string(IMPL_ENUM), key + " = " + enumKeyWithNamespace));
enum_to_name << "\t\t{" << enumKeyWithNamespace << ", \"" << key << "\"}," << std::endl;
name_to_enum << "\t\t{\"" << key << "\", " << enumKeyWithNamespace << "}," << std::endl;
diff --git a/source/RobotAPI/libraries/aron/core/codegenerator/codeWriter/cpp/serializer/toplevel/IntEnumClass.h b/source/RobotAPI/libraries/aron/core/codegenerator/codeWriter/cpp/serializer/toplevel/IntEnumClass.h
index bd4a0f812..4a73767f0 100644
--- a/source/RobotAPI/libraries/aron/core/codegenerator/codeWriter/cpp/serializer/toplevel/IntEnumClass.h
+++ b/source/RobotAPI/libraries/aron/core/codegenerator/codeWriter/cpp/serializer/toplevel/IntEnumClass.h
@@ -66,6 +66,6 @@ namespace armarx::aron::cppserializer::serializer
private:
// Members
static const std::map<std::string, std::pair<std::string, int>> ACCEPTED_TYPES;
- static constexpr const char* IMPL_ENUM = "__ImplEnum";
+ static constexpr const char* IMPL_ENUM = "ImplEnum";
};
}
--
GitLab