Changeset 2454 in Sophya for trunk/ArchTOIPipe/Kernel/toiseqbuff.cc

Timestamp:

Nov 14, 2003, 1:34:56 PM (22 years ago)

Author:

aubourg

Message:

pb longs sur magique

File:

• trunk/ArchTOIPipe/Kernel/toiseqbuff.cc (modified) (18 diffs)

trunk/ArchTOIPipe/Kernel/toiseqbuff.cc

@@ -3 +3 @@
 //                               Christophe Magneville
 //                               Reza Ansari
-// $Id: toiseqbuff.cc,v 1.15 2002-05-30 10:09:06 ansari Exp $
+// $Id: toiseqbuff.cc,v 1.16 2003-11-14 12:34:55 aubourg Exp $
 
 #include "toiprocessor.h"
@@ -74 +74 @@
 }
 
-TOI::DataStatus TOISeqBuffered::isDataAvailNL(int iStart, int iEnd) {
+TOI::DataStatus TOISeqBuffered::isDataAvailNL(long iStart, long iEnd) {
   if (iEnd < iStart) 
     throw RangeCheckError("TOISeqBuffered::isDataAvailNL : iEnd<iStart !");
@@ -83 +83 @@
 }
 
-TOI::DataStatus TOISeqBuffered::isDataAvailNL(int i) {
+TOI::DataStatus TOISeqBuffered::isDataAvailNL(long i) {
   return TOI::isDataAvailNL(i);
 }
 
-void TOISeqBuffered::wontNeedBefore(int i) {
+void TOISeqBuffered::wontNeedBefore(long i) {
   // $CHECK$  Reza 30/4/2001 - Je ne sais pas a quoi ca sert !
   //  next_out = i; $CHECK$  Reza 30/4/2001
@@ -95 +95 @@
 #ifndef NO_SOPHYA
 /* ---- l'interface va etre modifiee, NE PAS UTILISER
-Array TOISeqBuffered::doGetData(int iStart, int iEnd) {
+Array TOISeqBuffered::doGetData(long iStart, long iEnd) {
   //  if (iEnd < iStart) 
   //    throw RangeCheckError("TOI::getData : iEnd<iStart !");
@@ -104 +104 @@
   cleanWaitGet();
   Vector dat(iEnd - iStart + 1);
-  for (int i=0; i<iEnd-iStart+1; i++) {
+  for (long i=0; i<iEnd-iStart+1; i++) {
     dat(i) = dataRef(i+iStart);
   }
@@ -115 +115 @@
 #endif
 
-double TOISeqBuffered::getData(int i)
+double TOISeqBuffered::getData(long i)
 {
   double val; 
@@ -124 +124 @@
 
 
-void TOISeqBuffered::getData(int i, double & val, uint_8 & flg) {
+void TOISeqBuffered::getData(long i, double & val, uint_8 & flg) {
   lock();
   if (!started) { 
@@ -168 +168 @@
 
 
-void TOISeqBuffered::getData(int i, int n, double* data, uint_8* flg)
+void TOISeqBuffered::getData(long i, int n, double* data, uint_8* flg)
 {
   lock();
@@ -184 +184 @@
     throw RangeCheckError("TOISeqBuffered::getData(i) : data deleted");
   }
-  for(int j=i; j<i+n; j++) {
+  for(long j=i; j<i+n; j++) {
     while (j >= next_in) { 
       if (j>next_out) next_out = j; 
@@ -218 +218 @@
 #ifndef NO_SOPHYA
 /* ---- l'interface va etre modifiee, NE PAS UTILISER
-TArray<int_4> TOISeqBuffered::doGetFlag(int iStart, int iEnd) {
+TArray<int_4> TOISeqBuffered::doGetFlag(long iStart, long iEnd) {
   if (!started) waitGet(); 
   cleanWaitGet();
@@ -224 +224 @@
     throw RangeCheckError("TOISeqBuffered::getFlag(iS,iE) : data not available");
   TVector<int_4> dat(iEnd - iStart + 1);
-  for (int i=0; i<iEnd-iStart+1; i++) {
+  for (long i=0; i<iEnd-iStart+1; i++) {
     dat[i] = flagRef(i+iStart);
   }
@@ -233 +233 @@
 
 /*RZCMV
-int_4 TOISeqBuffered::doGetFlag(int i) {
+int_4 TOISeqBuffered::doGetFlag(long i) {
   if (!started) waitGet(); 
   cleanWaitGet();
@@ -245 +245 @@
 
 
-void TOISeqBuffered::putData(int i, double value, uint_8 flag) {
+void TOISeqBuffered::putData(long i, double value, uint_8 flag) {
   lock();
   if (!started) {
@@ -290 +290 @@
 }
 
-void TOISeqBuffered::putData(int i, int n, double const* val, uint_8 const* flg) 
+void TOISeqBuffered::putData(long i, int n, double const* val, uint_8 const* flg) 
 {
   lock();
@@ -309 +309 @@
     }
   }
-  for(int j=i; j<i+n; j++) {
+  for(long j=i; j<i+n; j++) {
     if (next_in-next_out >= wsize) { 
       if (dbglev > 0) 
@@ -357 +357 @@
 }
 
-int TOISeqBuffered::nextDataAvail(int iAfter) {
+long TOISeqBuffered::nextDataAvail(long iAfter) {
   lock();
   if (iAfter >= next_in ) {unlock(); return -1;}
@@ -365 +365 @@
 }
 
-void TOISeqBuffered::doGetData(int i, double & val, uint_8 & flg)
+void TOISeqBuffered::doGetData(long i, double & val, uint_8 & flg)
 {
   cerr << " TOISeqBuffered::doGetData() not implemented !"
@@ -372 +372 @@
 }
 
-void TOISeqBuffered::doPutData(int i, double value, uint_8 flag)
+void TOISeqBuffered::doPutData(long i, double value, uint_8 flag)
 {
   cerr << " TOISeqBuffered::doGetData() not implemented !"