Fixed removing objects from the _instances list in the CPP code

Now using the erase–remove idiom
IncQueryLabs · Jun 25, 2015 · 0948611 · 0948611
1 parent 3c3b767
commit 0948611
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...odegeneration/src/com/incquerylabs/emdw/cpp/codegeneration/templates/ClassTemplates.xtend b/...odegeneration/src/com/incquerylabs/emdw/cpp/codegeneration/templates/ClassTemplates.xtend
@@ -298,7 +298,7 @@ class ClassTemplates {
 		// Destructor
 		«IF destructors.size == 0»
 			«cppFQN»::~«cppClassName»() {
-				_instances.erase(std::find(_instances.begin(), _instances.end(), this));
+				_instances.erase(std::remove(_instances.begin(), _instances.end(), this), _instances.end());
 			}
 		«ENDIF»
 		«FOR destructor : destructors»

diff --git a/...eneration/src/com/incquerylabs/emdw/cpp/codegeneration/templates/OperationTemplates.xtend b/...eneration/src/com/incquerylabs/emdw/cpp/codegeneration/templates/OperationTemplates.xtend
@@ -65,7 +65,7 @@ class OperationTemplates {
 		'''
 			«operationSignature(destructor, true, false, false, false)» {
 				«actionCodeTemplates.generateActionCode(destructor.commonOperation.body)»
-				_instances.erase(std::find(_instances.begin(), _instances.end(), this));
+				_instances.erase(std::remove(_instances.begin(), _instances.end(), this), _instances.end());
 			}
 		'''
 	}