Changeset 2181 in Sophya

Timestamp:

Sep 4, 2002, 10:58:08 AM (23 years ago)

Author:

ansari

Message:

Correction TmpDir() ds cxxexecutor.cc + exception Peida nullPtrError en long , Reza 04/09/2002

Location:

trunk/SophyaPI/PIext

Files:

• cxxexecutor.cc (modified) (10 diffs)
• cxxexecutor.h (modified) (1 diff)

trunk/SophyaPI/PIext/cxxexecutor.cc

@@ -15 +15 @@
   : mUserCodeFn(""), mUserFctFn("")
   , mCompOpt(""), mLinkOpt(""), mMyLibs("")
-  , mDefTmp(""), mDefRoot("cxx_spiapp"), mDefFunc("usercxx"), mPrtLevel(2)
+  , mDefRoot("cxx_spiapp"), mDefFunc("usercxx"), mPrtLevel(2)
 {
 mIncList.resize(0);
@@ -32 +32 @@
 mModuleImportDefaultList.push_back("LinAlg");
 mModuleImportDefaultList.push_back("XAstroPack");
-
-// Gestion des fichiers par default dans TmpDir 
-NamedObjMgr omg;
-string tmpdir = omg.GetTmpDir();
-if(tmpdir.size()>1) mDefTmp = tmpdir;
 
 // On enregistre les nouvelles commandes 
@@ -270 +265 @@
 // Si un nom n'est pas precise alors TmpDir/cxx_spiapp.cc
 {
-if(cfilename.size()<1) cfilename = mDefTmp + mDefRoot + ".cc";
+if(cfilename.size()<1) cfilename = TmpDir() + mDefRoot + ".cc";
 
 if(func.size()<1) func = mDefFunc;
@@ -440 +435 @@
     <<" = dynamic_cast< "<<obtype<<" * >(omg.GetObj(___nomobj));"<<endl;
 #ifdef SANS_EVOLPLANCK
+  long mExcErr = nullPtrErr;
   os<<"if("<<stmp<<"==NULL) { \n"
     <<" cerr << \"CxxExecutor::PutObject: Non existing object "
     <<" ... please update file \\n \" ;"
-    <<" throw nullPtrErr ; \n } "<<endl;
+    <<" throw mExcErr ; \n } "<<endl;
 #else
   os<<"if("<<stmp<<"==NULL) throw NullPtrError"
@@ -501 +497 @@
 
 // Fill the file with user code
-mUserCodeFn = mDefTmp + mDefRoot + ".h";
+mUserCodeFn = TmpDir() + mDefRoot + ".h";
 ofstream os(mUserCodeFn.c_str(),ios::out);
 if(!os) {cout<<"CxxExecutor::FillUserCode: unable to open "
@@ -518 +514 @@
 mUserFctFn  = "";
 if(userfctcode.size()<1) return 0;
-mUserFctFn  = mDefTmp + mDefRoot + "_fct.h";
+mUserFctFn  = TmpDir() + mDefRoot + "_fct.h";
 ofstream os(mUserFctFn.c_str(),ios::out);
 if(!os) {cout<<"CxxExecutor::FillUserFctFrS: unable to open "
@@ -559 +555 @@
 //--------------------------------------------------------//
 {
-if(rootfilename.size()<1) rootfilename = mDefTmp + mDefRoot;
+if(rootfilename.size()<1) rootfilename = TmpDir() + mDefRoot;
 if(mPrtLevel>1) cout<<"Compile "<<rootfilename<<endl;
 
@@ -570 +566 @@
 CxxCompilerLinker cxx(true,true,true);
 #endif
-if(mDefTmp.size()>0) cxx.SetTmpDir(mDefTmp);
+if(TmpDir().size()>0) cxx.SetTmpDir(TmpDir());
 if(mPrtLevel>0) cxx.SetVerbose(true);
   else          cxx.SetVerbose(false);
@@ -619 +615 @@
 // Ne marche pas si TmpDir != ""
 //{
-//string makename = mDefTmp + mDefRoot + "_Makefile";
+//string makename = TmpDir() + mDefRoot + "_Makefile";
 //ofstream os(makename.c_str(),ios::out);
 //if(!os)
@@ -660 +656 @@
 int CxxExecutor::Link(string libname,string func)
 {
-if(libname.size()<1) libname = mDefTmp + mDefRoot + ".so";
-  else               libname = mDefTmp + libname;
+if(libname.size()<1) libname = TmpDir() + mDefRoot + ".so";
+  else               libname = TmpDir() + libname;
 if(func.size()<1) func = mDefFunc;
 

trunk/SophyaPI/PIext/cxxexecutor.h

@@ -86 +86 @@
 
 
-  string mDefTmp;
+  //  string mDefTmp; remplace par la methode TmpDir() - Reza 4/9/02
+  inline string const& TmpDir() { NamedObjMgr omg; return omg.GetTmpDir(); }
   string mDefRoot;
   string mDefFunc;