Changeset 2796 in Sophya

Timestamp:

Jun 3, 2005, 4:54:59 PM (20 years ago)

Author:

ansari

Message:

Remplacement is.getline(...) par getline(istream,string) - CxxCompilerLinker: ajout flag -pthread pour cxx et commandes pour icc (Intel) - Reza 3 Juin 2005

Location:

trunk/SophyaLib/SysTools

Files:

• commander.cc (modified) (1 diff)
• cxxcmplnk.cc (modified) (4 diffs)
• resusage.cc (modified) (1 diff)

trunk/SophyaLib/SysTools/commander.cc

@@ -178 +178 @@
   string line;
   while (!is.eof()) {
+    /* Reza, Juin 2005 : Remplace par getline(istream, string) - plus sur
+       is.getline(buff, 256); line += buff;  */
     rcc = 0;
-    is.clear(); 
-    is.getline(buff, 256);
-    line += buff;  
-    if (is.good()) { 
+    line = "";
+    getline(is,line);
+    if (is.good() || is.eof()) {
       rcc = ExecuteOnce(line);
-      line = "";
-    }
-    if (rcc == CMD_BREAKEXE_RC)  return rcc;
-    else if (rcc == CMD_BREAK_RC)  break;
+      if (rcc == CMD_BREAKEXE_RC)  return rcc;
+      else if (rcc == CMD_BREAK_RC)  break;
+    }
   }
 }

trunk/SophyaLib/SysTools/cxxcmplnk.cc

@@ -13 +13 @@
   The present version has been adapted for different compilers and 
   systems:
-  - Linux-g++
-  - Linux-KCC
-  - MacOS X/Darwin (Apple OS X 10.2 and 10.3)
-  - OSF-cxx : (HP/Compaq/Digital OSF-Tru64 and cxx c++ compiler)
-  - SGI-CC : Silicon Graphics system and C++ compiler
+  - Linux + GNU compiler (g++)
+  - Linux + Intel compiler (icc)
+  - Darwin + GNU compiler (MaxOS X 10.3 and 10.4)
+  - OSF1 + cxx  (HP/Compaq/Digital OSF-Tru64 and cxx c++ compiler)
+  - IRIX64 + CC : Silicon Graphics  system and C++ compiler
 
   \sa SOPHYA::PDynLinkMgr
@@ -39 +39 @@
 static char * KCC_opt = 
 "-O --exceptions --rtti  --auto_instantiation --one_instantiation_per_object -D__KCC__";
+static char * icc_opt = 
+"-O -fpic -frtti";
 static char * cxx_opt = 
-"-O -no_implicit_include ";
+"-O -no_implicit_include -pthread";
 static char * SGICC_opt =  "-O -prelink -D__SGICC__ -LANG:std";
 
@@ -85 +87 @@
   linkOptions = "-O -shared";
   syscomp += "g++/"; 
-#elif defined( __DECCXX )
+#endif
+#if defined( __DECCXX )
   compCmd = "cxx ";
   compOptions = cxx_opt;
-  linkOptions = compOptions + "-shared";
+  linkOptions = compOptions + " -shared";
   syscomp += "cxx/"; 
-#elif defined( __KCC__ )
+#endif
+#if defined( __KCC__ )
   compCmd = "KCC ";
   compOptions = KCC_opt;
   linkOptions = KCC_opt;
   syscomp += "KCC/";  
-#elif defined( __SGICC__ )
+#endif
+#if defined( __SGICC__ )
   compCmd = "CC ";
   compOptions = SGICC_opt;
@@ -104 +109 @@
   linkOptions += " -64 "; 
 #endif
+#endif
+#if defined( __INTEL_COMPILER )
+  compCmd = "icpc ";
+  compOptions = icc_opt;
+  linkOptions = icc_opt + " -shared";
+  syscomp += "icc/";  
 #endif
 

trunk/SophyaLib/SysTools/resusage.cc

@@ -204 +204 @@
   ifstream fich(flnm) ;
 
-  fich.getline(buff,200); // on saute une ligne 
+  fich.getline(buff,500); // on saute une ligne 
 
   string tst;