Changeset 277 for cpp/frams

Timestamp:

12/22/14 23:20:27 (10 years ago)

Author:

Maciej Komosinski

Message:

ParamInterface::load() can be aborted (used to avoid incorrect warnings about unknown fields when switching expdefs)

Location:

cpp/frams/param

Files:

• multiparamload.cpp (modified) (5 diffs)
• multiparamload.h (modified) (1 diff)

cpp/frams/param/multiparamload.cpp

@@ -19 +19 @@
 status=0;
 breakcond=OnError;
+aborting=false;
 emptyparam.setParamTab(empty_paramtab);
 }
@@ -57 +58 @@
         }
 status=Loading;
+aborting=false;
 }
 
@@ -68 +70 @@
 clearstack();
 status=Finished;
+aborting=true;
 }
 
@@ -96 +99 @@
                 Param tmp_param;
                 ParamInterface *pi=lastobject.getParamInterface(tmp_param);
-                pi->load(file);
+                pi->load(file,true,&aborting);
                 if ((status!=Finished) && maybeBreak(AfterObject))
                         break;
@@ -242 +245 @@
 Param tmp_param;
 ParamInterface *pi=o.getParamInterface(tmp_param);
-pi->load(file,warn_unknown_fields);
+pi->load(file,warn_unknown_fields,&aborting);
 status=AfterObject;
 return 0;

cpp/frams/param/multiparamload.h

@@ -45 +45 @@
 int breakcond;
 Param emptyparam;
+bool aborting;
 
 void init();