Changeset 277


Ignore:
Timestamp:
12/22/14 23:20:27 (7 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:
2 edited

Legend:

Unmodified
Added
Removed
  • cpp/frams/param/multiparamload.cpp

    r268 r277  
    1919status=0;
    2020breakcond=OnError;
     21aborting=false;
    2122emptyparam.setParamTab(empty_paramtab);
    2223}
     
    5758        }
    5859status=Loading;
     60aborting=false;
    5961}
    6062
     
    6870clearstack();
    6971status=Finished;
     72aborting=true;
    7073}
    7174
     
    9699                Param tmp_param;
    97100                ParamInterface *pi=lastobject.getParamInterface(tmp_param);
    98                 pi->load(file);
     101                pi->load(file,true,&aborting);
    99102                if ((status!=Finished) && maybeBreak(AfterObject))
    100103                        break;
     
    242245Param tmp_param;
    243246ParamInterface *pi=o.getParamInterface(tmp_param);
    244 pi->load(file,warn_unknown_fields);
     247pi->load(file,warn_unknown_fields,&aborting);
    245248status=AfterObject;
    246249return 0;
  • cpp/frams/param/multiparamload.h

    r268 r277  
    4545int breakcond;
    4646Param emptyparam;
     47bool aborting;
    4748
    4849void init();
Note: See TracChangeset for help on using the changeset viewer.