Changeset 996 for trunk/src/Scantable.cpp

Timestamp:

04/06/06 13:45:58 (18 years ago)

Author:

mar637

Message:

more fixes after compiling with -Wall.

File:

• trunk/src/Scantable.cpp (modified) (6 diffs)

trunk/src/Scantable.cpp

@@ -101 +101 @@
   initFactories();
   Table tab(name, Table::Update);
-  Int version;
+  uInt version;
   tab.keywordSet().get("VERSION", version);
   if (version != version_) {
@@ -322 +322 @@
 
 int Scantable::nscan() const {
-  int n = 0;
-  Int previous = -1; Int current = 0;
   Vector<uInt> scannos(scanCol_.getColumn());
   uInt nout = GenSort<uInt>::sort( scannos, Sort::Ascending,
@@ -384 +382 @@
 {
   bool throwIt = true;
-  Instrument ins = STAttr::convertInstrument(name, throwIt);
+  // create an Instrument to see if this is valid
+  STAttr::convertInstrument(name, throwIt);
   String nameU(name);
   nameU.upcase();
@@ -555 +554 @@
   oss << "Computed azimuth/elevation using " << endl
       << mp << endl;
-  for (uInt i=0; i<nrow(); ++i) {
+  for (Int i=0; i<nrow(); ++i) {
     MEpoch me = timeCol(i);
     MDirection md = getDirection(i);
@@ -795 +794 @@
 std::vector< double > asap::Scantable::getAbcissa( int whichrow ) const
 {
-  if ( whichrow > table_.nrow() ) throw(AipsError("Illegal ro number"));
+  if ( whichrow > int(table_.nrow()) ) throw(AipsError("Illegal ro number"));
   std::vector<double> stlout;
   int nchan = specCol_(whichrow).nelements();
@@ -864 +863 @@
 std::string Scantable::getAbcissaLabel( int whichrow ) const
 {
-  if ( whichrow > table_.nrow() ) throw(AipsError("Illegal ro number"));
+  if ( whichrow > int(table_.nrow()) ) throw(AipsError("Illegal ro number"));
   const MPosition& mp = getAntennaPosition();
   const MDirection& md = getDirection(whichrow);