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

Merge remote-tracking branch 'origin/master' into fix/armem_mps_deps

parents 39cd18b5 0fa7837d
No related branches found
No related tags found
1 merge request!199armem_mps: adding missing dependency, removing include
......@@ -93,7 +93,7 @@ namespace armarx::armem::server::ltm
virtual void _store(const armem::wm::Memory& memory) = 0;
public:
bool enabled = true;
bool enabled = false;
protected:
mutable std::recursive_mutex ltm_mutex;
......
......@@ -21,8 +21,6 @@ namespace armarx::armem::server::ltm::disk
{
ARMARX_CHECK(!p.empty());
util::ensureFolderExists(p);
MemoryID m;
m.memoryName = p.filename();
return m;
......
......@@ -32,14 +32,11 @@ namespace armarx::armem::server::plugins
}
// stuff for ltm
if (longtermMemory.enabled) // if not explicitly set to false in constructor of component (then we dont need the params)
if (not properties->hasDefinition(prefix + "ltm.enabled"))
{
if (not properties->hasDefinition(prefix + "ltm.enabled"))
{
properties->optional(longtermMemory.enabled, prefix + "ltm.enabled");
}
//longtermMemory.createPropertyDefinitions(properties, "ltm.");
properties->optional(longtermMemory.enabled, prefix + "ltm.enabled");
}
longtermMemory.createPropertyDefinitions(properties, prefix + "ltm.");
// Publish memory updates topic
properties->topic(memoryTopic, memoryTopicDefaultName);
......
......@@ -195,6 +195,16 @@ namespace armarx::aron::codegenerator::cpp
CppMethodPtr m = CppMethodPtr(new CppMethod("template<class T>\nvoid read(armarx::aron::data::ReaderInterface<T>& " + ARON_READER_ACCESSOR + ", T& input)", doc.str()));
CppBlockPtr b = std::make_shared<CppBlock>();
b->addLine("using TNonConst = typename std::remove_const<T>::type;");
auto makeSuppressUnusedBlock = []()
{
auto block = std::make_shared<CppBlock>();
block->addLine("const TNonConst* _suppressUnusedWarning;");
block->addLine("(void) _suppressUnusedWarning;");
return block;
};
b->addBlock(makeSuppressUnusedBlock());
b->addLine("this->resetSoft();");
b->addLine("if (" + ARON_READER_ACCESSOR + ".readNull(input))");
b->addLineAsBlock("throw armarx::aron::error::AronException(__PRETTY_FUNCTION__, \"The input to the read method must not be null.\");");
......
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