Skip to content
Snippets Groups Projects
Commit c0d47471 authored by Fabian Reister's avatar Fabian Reister
Browse files

fixing merge

parent 0dd4df30
No related branches found
No related tags found
Loading
......@@ -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;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment