Changeset 3572 in Sophya for trunk/SophyaPI/PIext/cxxexecutor.cc

Timestamp:

Feb 7, 2009, 10:50:34 PM (17 years ago)

Author:

cmv

Message:

char* -> const char* pour regler les problemes de deprecated string const... + comparaison unsigned signed + suppression EVOL_PLANCK rz+cmv 07/02/2009

File:

• trunk/SophyaPI/PIext/cxxexecutor.cc (modified) (4 diffs)

trunk/SophyaPI/PIext/cxxexecutor.cc

@@ -394 +394 @@
   <<endl
 
-#ifdef SANS_EVOLPLANCK
-  <<"//---- Peida include files"<<endl
-  <<"#include \"toutpeida.h\""<<endl
-#else
   // Si on enleve sopnamsp.h (using namespace SOPHYA), il faudra accoler 
   // SOPHYA:: à toutes les déclarations automatiques - Reza, 10/09/2004 
@@ -409 +405 @@
   <<"#include \"histats.h\""<<endl
   <<endl
-#endif
 
   <<"//---- Spiapp include files"<<endl
@@ -497 +492 @@
   os<<obtype<<"* "<<stmp
     <<" = dynamic_cast< "<<obtype<<" * >(omg.GetObj(___nomobj));"<<endl;
-#ifdef SANS_EVOLPLANCK
-  os<<"if("<<stmp<<"==NULL) { \n"
-    <<" long mExcErr = nullPtrErr; \n"
-    <<" cerr << \"CxxExecutor::PutObject: Non existing object "
-    <<" ... please update file \\n \" ;"
-    <<" throw mExcErr ; \n } "<<endl;
-#else
   os<<"if("<<stmp<<"==NULL) throw NullPtrError"
     <<"(\"CxxExecutor::PutObject: Non existing object "<<nobj
     <<"... please update file\");"<<endl;
-#endif
   os<<obtype<<"& "<<nobj<<" = (*"<<stmp<<");"<<endl<<endl;
 }
@@ -622 +609 @@
 
 int rc;
-#ifdef SANS_EVOLPLANCK
-CxxCompilerLinker cxx;
-string sophlib = " -lPIE -lm ";
-cxx.AddLinkOptions(sophlib);
-#else
 CxxCompilerLinker cxx(true,true,true);
-#endif
 if(TmpDir().size()>0) cxx.SetTmpDir(TmpDir());
 if(mPrtLevel>0) cxx.SetVerbose(true);