Changeset 2393 in Sophya

Timestamp:

May 28, 2003, 11:03:53 PM (22 years ago)

Author:

aubourg

Message:

pour magique

Location:

trunk/ArchTOIPipe

Files:

• Kernel/ringprocessor.cc (modified) (3 diffs)
• Kernel/toimanager.cc (modified) (4 diffs)
• SMakefile.h (modified) (1 diff)

trunk/ArchTOIPipe/Kernel/ringprocessor.cc

@@ -3 +3 @@
 //                               Christophe Magneville
 //                               Reza Ansari
-// $Id: ringprocessor.cc,v 1.2 2003-05-20 10:10:09 aubourg Exp $
+// $Id: ringprocessor.cc,v 1.3 2003-05-28 21:03:52 aubourg Exp $
 
 #include "ringprocessor.h"
@@ -9 +9 @@
 #include "toimanager.h"
 
-#include <iostream>
+#include <iostream.h>
 #include <typeinfo>        // ajout pour linux
 #ifdef HAVE_VALUES_H
@@ -55 +55 @@
 void RingProcessor::afterinit() {
   inRings = new (RingPipe*[inRingIx.size()]);
-  for (int i=0; i<inRingIx.size(); i++)
-    inRings[i] = NULL;
+  {for (int i=0; i<inRingIx.size(); i++)
+    inRings[i] = NULL;}
   outRings = new (RingPipe*[outRingIx.size()]);
-  for (int i=0; i<outRingIx.size(); i++)
-    outRings[i] = NULL;
+  {for (int i=0; i<outRingIx.size(); i++)
+    outRings[i] = NULL;}
 }
 

trunk/ArchTOIPipe/Kernel/toimanager.cc

@@ -3 +3 @@
 //                               Christophe Magneville
 //                               Reza Ansari
-// $Id: toimanager.cc,v 1.22 2003-05-20 10:10:09 aubourg Exp $
+// $Id: toimanager.cc,v 1.23 2003-05-28 21:03:53 aubourg Exp $
 
 #include "toimanager.h"
@@ -79 +79 @@
 
   // demarrage
-  for (vector<TOIProcessor*>::iterator i = processors.begin();
+  {for (vector<TOIProcessor*>::iterator i = processors.begin();
        i != processors.end(); i++) {
     TOIProcessor* proc = *i;
@@ -86 +86 @@
     proc->start();
     cout << "processor started " << endl;
-  }
-
-  for (vector<RingProcessor*>::iterator i = ringProcessors.begin();
+  }}
+
+  {for (vector<RingProcessor*>::iterator i = ringProcessors.begin();
        i != ringProcessors.end(); i++) {
     RingProcessor* proc = *i;
@@ -95 +95 @@
     proc->start();
     cout << "processor started " << endl;
-  }
+  }}
   cout << "**********************" << endl;
 }

trunk/ArchTOIPipe/SMakefile.h

@@ -24 +24 @@
 
 
-CPPFLAGS     :=  ${CPPFLAGS} -I${AINC} -I${EXTINCPATH}/FitsIO -DWITH_SOPHYA
+CPPFLAGS     :=  ${CPPFLAGS} -I${AINC} -I${EXTINCPATH}/FitsIO -DWITH_SOPHYA -I$(PIOINCDIR)
 
 #- redefine implicit rule. Les .o sont dans $(OBJ).