Merge branch 'v2.2'

src/core/CLTool.cpp

@@ -94,7 +94,7 @@ bool CLTool::readCommandLineArgs( int argc, char**argv, FILE*out ){
                if( a==thiskey ){
                    prefix=thiskey+"="; found=true;
                    inputData.insert(std::pair<std::string,std::string>(thiskey,""));
-               } else if( a.find(thiskey+"=")==0){
+               } else if(Tools::startWith(a,thiskey+"=")){
                    a.erase(0,a.find("=")+1); prefix=""; found=true;
                    if(inputData.count(thiskey)==0){
                       inputData.insert(std::pair<std::string,std::string>(thiskey,a));

src/core/CLToolMain.cpp

@@ -144,7 +144,7 @@ int CLToolMain::run(int argc, char **argv,FILE*in,FILE*out,Communicator& pc){
       }
     } else if(a=="--standalone-executable"){
       standalone_executable=true;
-    } else if(a.find("--load=")==0){
+    } else if(Tools::startWith(a,"--load=")){
       a.erase(0,a.find("=")+1);
       prefix="";
       void *p=dlloader.load(a);

src/tools/Tools.cpp

@@ -322,4 +322,9 @@ std::string Tools::extension(const std::string&s){
   return ext;
 }
 
+bool Tools::startWith(const std::string & full,const std::string &start){
+  return (full.substr(0,start.length())==start);
+}
+
+
 }

src/tools/Tools.h

@@ -121,6 +121,9 @@ public:
   static std::string extension(const std::string&);
 /// Fast int power
   static double fastpow(double base,int exp);
+/// Check if a string full starts with string start.
+/// Same as full.find(start)==0
+  static bool startWith(const std::string & full,const std::string &start);
 };
 
 template <class T>