Skip to content
Snippets Groups Projects

Merge of all branches of Fabian PK (related to skills)

Merged Fabian Tërnava requested to merge test/merge-branch-skills-to-master into master
1 file
+ 3
2
Compare changes
  • Side-by-side
  • Inline
@@ -188,6 +188,7 @@ namespace armarx::aron::codegenerator::cpp
CppMethodPtr m = CppMethodPtr(new CppMethod("virtual void resetSoft() override", doc.str()));
CppBlockPtr b = this->getResetSoftBlock("");
m->setBlock(b);
m->setEnforceBlockGeneration(true);
return m;
}
@@ -200,6 +201,7 @@ namespace armarx::aron::codegenerator::cpp
CppMethodPtr m = CppMethodPtr(new CppMethod("virtual void resetHard() override", doc.str()));
CppBlockPtr b = this->getResetHardBlock("");
m->setBlock(b);
m->setEnforceBlockGeneration(true);
return m;
}
@@ -216,6 +218,7 @@ namespace armarx::aron::codegenerator::cpp
std::string dummy;
b->appendBlock(this->getWriteTypeBlock("", "", Path(), dummy));
m->setBlock(b);
m->setEnforceBlockGeneration(true);
return m;
}
@@ -520,5 +523,3 @@ namespace armarx::aron::codegenerator::cpp
return block_if_data;
}
}
Loading