From c0d47471e002c396467d008f32ce3d0f966bb2a9 Mon Sep 17 00:00:00 2001
From: Fabian Reister <fabian.reister@kit.edu>
Date: Mon, 5 Jun 2023 17:29:34 +0200
Subject: [PATCH] fixing merge
---
.../codewriter/cpp/generator/ndarray/Matrix.cpp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/source/RobotAPI/libraries/aron/codegeneration/codegenerator/codewriter/cpp/generator/ndarray/Matrix.cpp b/source/RobotAPI/libraries/aron/codegeneration/codegenerator/codewriter/cpp/generator/ndarray/Matrix.cpp
index a2714c879..be7974fb2 100644
--- a/source/RobotAPI/libraries/aron/codegeneration/codegenerator/codewriter/cpp/generator/ndarray/Matrix.cpp
+++ b/source/RobotAPI/libraries/aron/codegeneration/codegenerator/codewriter/cpp/generator/ndarray/Matrix.cpp
@@ -105,10 +105,10 @@ namespace armarx::aron::codegenerator::cpp::generator
b->addLine("auto " + variantAccessor + " = " + ARON_WRITER_ACCESSOR +
".writeMatrix(static_cast<int>( " + std::to_string(type.getRows()) + "), " + "static_cast<int>( " +
std::to_string(type.getCols()) + "), " +
- std::get<2>(ElementType2Cpp.at(type.getElementType())) + ", " +
- conversion::Maybe2CppString.at(type.getMaybe()) + ", " + "armarx::aron::Path(" +
- ARON_PATH_ACCESSOR + ", {" + simox::alg::join(p.getPath(), ", ") +
- "})); // of " + cppAccessor);
+ std::get<2>(ElementType2Cpp.at(type.getElementType())) + ", " + "\"" +
+ type.getDefaultValue() + "\", " + conversion::Maybe2CppString.at(type.getMaybe()) +
+ ", " + "armarx::aron::Path(" + ARON_PATH_ACCESSOR + ", {" +
+ simox::alg::join(p.getPath(), ", ") + "})); // of " + cppAccessor);
return b;
}
--
GitLab