Changeset 1410 in Sophya

Timestamp:

Feb 20, 2001, 5:15:21 PM (25 years ago)

Author:

ansari

Message:

changement include xstream en xstream.h et suppression de variables re-declarees pour compil avec SGI-CC , Reza 20/2/2001

Location:

trunk/ArchTOIPipe/Kernel

Files:

• asciitoiwtr.h (modified) (1 diff)
• fitstoiwtr.cc (modified) (1 diff)
• toimanager.cc (modified) (1 diff)
• toimanager.h (modified) (1 diff)
• toiprocessor.h (modified) (1 diff)

trunk/ArchTOIPipe/Kernel/asciitoiwtr.h

@@ -6 +6 @@
 #include "toi.h"
 #include "toiprocessor.h"
-#include <fstream>
+#include <fstream.h>
 
 class ASCIITOIWriter : public TOIProcessor {

trunk/ArchTOIPipe/Kernel/fitstoiwtr.cc

@@ -54 +54 @@
   colunits[0] = "integer";
 
-  for (map<string, int>::iterator i = inIx.begin(); i != inIx.end(); i++) {
-    int j = (*i).second;
-    string n = (*i).first;
+  for (map<string, int>::iterator ii = inIx.begin(); ii != inIx.end(); ii++) {
+    int j = (*ii).second;
+    string n = (*ii).first;
     if (outFlags) j += j;
     colnames[j+1] = const_cast<char*>(n.c_str());

trunk/ArchTOIPipe/Kernel/toimanager.cc

@@ -2 +2 @@
 #include <limits.h>
 #include <pthread.h>
-#include <iostream>
+#include <iostream.h>
 
 TOIManager::TOIManager() {

trunk/ArchTOIPipe/Kernel/toimanager.h

@@ -5 +5 @@
 
 #include <vector>
+
+using namespace std;
 
 class TOIManager {

trunk/ArchTOIPipe/Kernel/toiprocessor.h

@@ -11 +11 @@
 #include <string>
 #include <map>
-#include <iostream>
+#include <iostream.h>
 
 #ifndef NO_SOPHYA