Changeset 12015 for issm/trunk-jpl/src/c/Container/Options.cpp

Timestamp:

04/16/12 19:08:00 (13 years ago)

Author:

Eric.Larour

Message:

Rearraning the code a little bit more.
Taking out last remnants of SERIAL protected code.

File:

• issm/trunk-jpl/src/c/Container/Options.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/Container/Options.cpp

@@ -20 +20 @@
 #include "../shared/shared.h"
 #include "../EnumDefinitions/EnumDefinitions.h"
-#if _SERIAL_
 #include "../io/io.h"
-#endif
 /*}}}*/
 
@@ -31 +29 @@
 }
 /*}}}*/
-#if defined(_HAVE_MATLAB_) && defined(_SERIAL_)
-/*FUNCTION Options::Options(int istart, int nrhs, const mxArray* prhs[]){{{1*/
-Options::Options(int istart, int nrhs, const mxArray* prhs[]){
-
-        int            i;
-        char          *name    = NULL;
-        Option *option = NULL;
-
-        /*loop over each name and value*/
-        for (i=istart; i<nrhs; i=i+2){
-                if (!mxIsClass(prhs[i],"char")) _error_("Argument %d must be name of option.",i+1);
-
-                FetchData(&name,prhs[i]);
-                if (i+1 == nrhs) _error_("Argument %d must exist and be value of option \"%s\".",i+2,name);
-
-                //_printf_(true,"  Processing option \"%s\" of class \"%s\".\n",name,mxGetClassName(prhs[i+1]));
-                option=(Option*)OptionParse(name,&prhs[i+1]);
-                this->AddOption(option);
-                option=NULL;
-        }
-
-        /*echo the dataset  */
-        //if (this->Size()) for(i=0;i<this->Size();i++) ((Option*)this->GetObjectByOffset(i))->Echo();
-}
-/*}}}*/
-#endif
 /*FUNCTION Options::~Options(){{{1*/
 Options::~Options(){