Changeset 25836 for issm/trunk/src/c/modules/OutputDefinitionsResponsex/OutputDefinitionsResponsex.cpp

Timestamp:

12/08/20 08:45:53 (4 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 25834

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/c (modified) (1 prop)
• src/c/modules/OutputDefinitionsResponsex/OutputDefinitionsResponsex.cpp (modified) (3 diffs)

issm/trunk/src/c

@@ -23 +23 @@
 issm_ocean
 issm_dakota
+issm_post

@@ -23 +23 @@
 issm_ocean
 issm_dakota
+issm_post

issm/trunk/src/c/modules/OutputDefinitionsResponsex/OutputDefinitionsResponsex.cpp

@@ -14 +14 @@
 
         /*Now, go through the output definitions, and retrieve the object which corresponds to our requested response, output_string: */
-        for(int i=0;i<output_definitions->Size();i++){
-                Definition* definition=dynamic_cast<Definition*>(output_definitions->GetObjectByOffset(i));
+        for(Object* & object : output_definitions->objects){
+                Definition* definition=dynamic_cast<Definition*>(object);
 
                 char* name = definition->Name();
@@ -42 +42 @@
 
         /*Now, go through the output definitions, and retrieve the object which corresponds to our requested response, output_enum: */
-        for(int i=0;i<output_definitions->Size();i++){
-
-                //Definition* definition=xDynamicCast<Definition*>(output_definitions->GetObjectByOffset(i));
-                Definition* definition=dynamic_cast<Definition*>(output_definitions->GetObjectByOffset(i));
+        for(Object* & object : output_definitions->objects){
+                Definition* definition=dynamic_cast<Definition*>(object);
 
                 int en = definition->DefinitionEnum();
@@ -59 +57 @@
 
         /*If we are here, did not find the definition for this response, not good!: */
-        _error_("Could not find the response for output definition " << EnumToStringx(output_enum) 
+        _error_("Could not find the response for output definition " << EnumToStringx(output_enum)
                                 <<" ("<<output_enum<<")"
                                 << " because could not find the definition itself!");

@@ -23 +23 @@
 issm_ocean
 issm_dakota
+issm_post