Changeset 2163 for trunk

Timestamp:

05/10/11 15:02:56 (13 years ago)

Author:

Malte Marquarding

Message:

Remove various compiler warnings

Location:

trunk/src

Files:

• LineCatalog.cpp (modified) (1 diff)
• MathUtils.cpp (modified) (4 diffs)
• PKSFiller.cpp (modified) (1 diff)
• PKSFiller.h (modified) (1 diff)
• STAsciiWriter.cpp (modified) (1 diff)
• STAttr.cpp (modified) (1 diff)
• STFiller.cpp (modified) (3 diffs)
• STFitter.cpp (modified) (1 diff)
• STLineFinder.cpp (modified) (2 diffs)
• STMath.cpp (modified) (8 diffs)
• STPol.h (modified) (1 diff)
• STPolLinear.cpp (modified) (3 diffs)
• STWriter.h (modified) (1 diff)
• Scantable.cpp (modified) (9 diffs)
• Scantable.h (modified) (1 diff)
• ScantableWrapper.h (modified) (1 diff)
• python_asap.h (modified) (1 diff)

trunk/src/LineCatalog.cpp

@@ -99 +99 @@
     }
   } else {
-      if ( row < table_.nrow() ) {
+    if ( row < int(table_.nrow()) ) {
         oss << std::right << setw(7) << row << setw(2) << "";
         oss << std::left << setw(20) << getName(row);

trunk/src/MathUtils.cpp

@@ -133 +133 @@
                        const Vector<Float>& in, const Vector<Bool>& mask,
                        Bool relaxed, Bool ignoreOther) {
+  (void) ignoreOther; //suppress unused warning
   Vector< Vector<Float> > weights(8);
   Vector<Float> vals(3);
@@ -181 +182 @@
                              float width)
 {
-  Int hwidth = Int(width+0.5);
-  Int fwidth = hwidth*2+1;
+  uInt hwidth = Int(width+0.5);
+  uInt fwidth = hwidth*2+1;
   out.resize(in.nelements());
   outflag.resize(flag.nelements());
@@ -189 +190 @@
   Float medval = ms.add(const_cast<Vector<Float>& >(in)(sl),
                   const_cast<Vector<Bool>& >(flag)(sl));
+  (void) medval;//suppress unused warning
   uInt n = in.nelements();
   for (uInt i=hwidth; i<(n-hwidth); ++i) {
@@ -208 +210 @@
                        float width, int order)
 {
-  Int hwidth = Int(width+0.5);
-  Int fwidth = hwidth*2+1;
+  uInt hwidth = Int(width+0.5);
+  uInt fwidth = hwidth*2+1;
   out.resize(in.nelements());
   outmask.resize(mask.nelements());

trunk/src/PKSFiller.cpp

@@ -257 +257 @@
     fseek( fp, 640, SEEK_SET ) ;
     char buf[81] ;
-    fread( buf, 80, 1, fp ) ;
+    size_t tmp = fread( buf, 80, 1, fp ) ;
+    (void) tmp;
     buf[80] = '\0' ;
     if ( strstr( buf, "NRAO_GBT" ) != NULL ) {

trunk/src/PKSFiller.h

@@ -24 +24 @@
 #include "Scantable.h"
 
-class casa::Record;
 class PKSreader;
 

trunk/src/STAsciiWriter.cpp

@@ -138 +138 @@
     //        stable.molecules().getRestFrequency(rec.asuInt("MOLECULE_ID") ));
     addLine(of, "Rest Freq.", restfreqs[0]);
-    for ( unsigned int i=1; i<nf; ++i) {
+    for ( int i=1; i<nf; ++i) {
       addLine(of, " ", restfreqs[i]);
     }

trunk/src/STAttr.cpp

@@ -52 +52 @@
 }
 
-STAttr::STAttr(const STAttr& other)
-{
+STAttr::STAttr(const STAttr& other):
+  Logger()
+{
+  (void) other; //suppress unused warning
    initData();                     // state just private 'static' data
 }

trunk/src/STFiller.cpp

@@ -307 +307 @@
 **/
 
+#ifdef HAS_ALMA
   Double min = 0.0;
   Double max = nInDataRow;
-#ifdef HAS_ALMA
   ProgressMeter fillpm(min, max, "Data importing progress");
 #endif
@@ -320 +320 @@
     fseek( fp, 640, SEEK_SET ) ;
     char buf[81] ;
-    fread( buf, 80, 1, fp ) ;
+    size_t tmpret = fread( buf, 80, 1, fp ) ;
+    (void) tmpret;
     buf[80] = '\0' ;
     if ( strstr( buf, "NRAO_GBT" ) != NULL ) {
@@ -883 +884 @@
   char buf[9] ;
   char buf2[80] ;
-  fread( buf, 4, 1, fp ) ;
+  size_t tmpret;
+  tmpret = fread( buf, 4, 1, fp ) ;
   buf[4] = '\0' ;
   fseek( fp, 640, SEEK_SET ) ;
-  fread( buf2, 80, 1, fp ) ;
+  tmpret = fread( buf2, 80, 1, fp ) ;
+  (void) tmpret; //suppress unused warning
   if ( ( strncmp( buf, "RW", 2 ) == 0 ) || ( strstr( buf2, "NRO45M" ) != NULL ) ) {
     bval = true ;

trunk/src/STFitter.cpp

@@ -101 +101 @@
     }
   }
-  for (uInt j=m_.nelements()-1; j>=0;--j) {
+  // use Int to suppress compiler warning
+  for (Int j=m_.nelements()-1; j>=0;--j) {
     if (m_[j]) {
       mx = j;

trunk/src/STLineFinder.cpp

@@ -94 +94 @@
    const casa::Float& getLinMean() const throw(AipsError);
    const casa::Float& getLinVariance() const throw(AipsError);
-   const casa::Float aboveMean() const throw(AipsError);
+   casa::Float aboveMean() const throw(AipsError);
    int getChannel() const throw();
 
@@ -505 +505 @@
 }
 
-const casa::Float RunningBox::aboveMean() const throw(AipsError)
+casa::Float RunningBox::aboveMean() const throw(AipsError)
 {
   DebugAssert(cur_channel<edge.second, AipsError);

trunk/src/STMath.cpp

@@ -318 +318 @@
 
 CountedPtr< Scantable >
-  STMath::averageChannel( const CountedPtr < Scantable > & in,
+STMath::averageChannel( const CountedPtr < Scantable > & in,
                           const std::string & mode,
                           const std::string& avmode )
 {
+  (void) mode; // currently unused
   // check if OTF observation
   String obstype = in->getHeader().obstype ;
@@ -836 +837 @@
   /// modes should be "nearest", "pair"
   // make this operation non insitu
+  (void) mode; //currently unused
   const Table& tin = in->table();
   Table ons = tin(tin.col("SRCTYPE") == Int(SrcType::PSON));
@@ -1405 +1407 @@
 
 
+  (void) scans; //currently unused
   STSelector sel;
   CountedPtr< Scantable > ws = getScantable(s, false);
@@ -2714 +2717 @@
                              mask, timeCol(i), !first,
                              interp, False);
+          (void) ok; // unused stop compiler nagging      
           // back into scantable
           flagOut.resize(maskOut.nelements());
@@ -4259 +4263 @@
 CountedPtr<Scantable> STMath::almacalfs( const CountedPtr<Scantable>& s )
 {
+  (void) s; //currently unused
   CountedPtr<Scantable> out ;
 
@@ -4711 +4716 @@
                                             string antname ) 
 {
+  (void) cold; //currently unused
   string reftime = on->getTime( index ) ;
   vector<int> ii( 1, on->getIF( index ) ) ;
@@ -4805 +4811 @@
                                               int index ) 
 {
+  (void) cold; //currently unused
   string reftime = sig->getTime( index ) ;
   vector<int> ii( 1, sig->getIF( index ) ) ;
@@ -4843 +4850 @@
                                               int index ) 
 {
+  (void) cold; //currently unused
   string reftime = sig->getTime( index ) ;
   vector<int> ii( 1, sig->getIF( index ) ) ;

trunk/src/STPol.h

@@ -66 +66 @@
   virtual casa::Vector<casa::Float> getLinear( casa::uInt index ) = 0;
 
-  virtual void rotatePhase( casa::Float phase ) {}
-  virtual void rotateLinPolPhase( casa::Float phase ) {}
+  virtual void rotatePhase( casa::Float ) {}
+  virtual void rotateLinPolPhase( casa::Float) {}
 
-  virtual void invertPhase( casa::Float phase ) {}
+  virtual void invertPhase( casa::Float ) {}
 
   casa::uInt nspec() const { return basespectra_.ncolumn(); }

trunk/src/STPolLinear.cpp

@@ -30 +30 @@
 Vector<Float> asap::STPolLinear::getStokes( uint index )
 {
-  if ( index < 0 || index >4 ) throw(AipsError("Stokes index out of range"));
+  if ( index > 4 ) throw(AipsError("Stokes index out of range"));
   Vector<Float> out;
   Float phase = getTotalPhase();
@@ -61 +61 @@
     throw(AipsError("You must have 4 linear polarizations to run this function"));
   }
-  if ( index < 0 || index >4 ) throw(AipsError("LinPol index out of range"));
+  if ( index >4 ) throw(AipsError("LinPol index out of range"));
   Vector<Float> out,q,u;
   if ( nspec() == 4) {
@@ -129 +129 @@
 {
   // phase isnt used, just ro keep interface the same for all pol operations
+  (void) phase;
   if (nspec() != 4) {
     throw(AipsError("You must have 4 linear polarizations to run this function"));

trunk/src/STWriter.h

@@ -42 +42 @@
 
 class PKSwriter;
-class casa::Table;
 
 namespace asap {

trunk/src/Scantable.cpp

@@ -137 +137 @@
          << "Data will be loaded from " << outname << " instead of " 
          << name << LogIO::POST ;
-      system( exec.c_str() ) ;
+      int tmp = system( exec.c_str() ) ;
+      (void) tmp;
       tab = Table(outname, Table::Update ) ;
       //os << "tab.tableName()=" << tab.tableName() << LogIO::POST ;
@@ -178 +179 @@
 */
 
-Scantable::Scantable( const Scantable& other, bool clear )
+Scantable::Scantable( const Scantable& other, bool clear ):
+  Logger()
 {
   // with or without data
@@ -986 +988 @@
 
 
-std::string Scantable::headerSummary( bool verbose )
+std::string Scantable::headerSummary()
 {
   // Format header info
@@ -1035 +1037 @@
   oss << setw(15) << "Abcissa:" << getAbcissaLabel(0) << endl;
   oss << selector_.print() << endl;
-  /// @todo implement verbose mode
   return String(oss);
 }
 
-std::string Scantable::summary( bool verbose )
+std::string Scantable::summary()
 {
   ostringstream oss;
@@ -1048 +1049 @@
 
   // Format header info
-  oss << headerSummary(verbose);
+  oss << headerSummary();
   oss << endl;
 
@@ -1112 +1113 @@
     ++iter;
   }
-  /// @todo implement verbose mode
   return String(oss);
 }
@@ -1282 +1282 @@
 void Scantable::setRestFrequencies( const vector<std::string>& name )
 {
+  (void) name; // suppress unused warning
   throw(AipsError("setRestFrequencies( const vector<std::string>& name ) NYI"));
   ///@todo implement
@@ -2684 +2685 @@
 
 
-std::string Scantable::formatBaselineParamsHeader(int whichrow, const std::string& masklist, bool verbose) const
+std::string Scantable::formatBaselineParamsHeader(int whichrow, 
+                                                  const std::string& masklist, 
+                                                  bool verbose) const
 {
   ostringstream oss;
@@ -2719 +2722 @@
 }
 
-  std::string Scantable::formatBaselineParams(const std::vector<float>& params, const std::vector<bool>& fixed, float rms, const std::string& masklist, int whichrow, bool verbose, int start, int count, bool resetparamid) const
+  std::string Scantable::formatBaselineParams(const std::vector<float>& params, 
+                                              const std::vector<bool>& fixed, 
+                                              float rms, 
+                                              const std::string& masklist, 
+                                              int whichrow, 
+                                              bool verbose, 
+                                              int start, int count,
+                                              bool resetparamid) const
 {
   int nParam = (int)(params.size());

trunk/src/Scantable.h

@@ -372 +372 @@
     { historyTable_.append(otherhist); }
 
-  std::string headerSummary(bool verbose=false);
-  std::string summary(bool verbose=false);
+  std::string headerSummary();
+  std::string summary();
   //std::string getTime(int whichrow=-1, bool showdate=true) const;
   std::string getTime(int whichrow=-1, bool showdate=true, casa::uInt prec=0) const;

trunk/src/ScantableWrapper.h

@@ -218 +218 @@
 
   std::string summary(bool verbose=false) const {
-    return table_->summary(verbose);
+    return table_->summary();
   }
 
   std::string listHeader(bool verbose=false) const {
-    return table_->headerSummary(verbose);
-  }
-
-  std::vector<std::string> getHistory()const
+    return table_->headerSummary();
+  }
+
+  std::vector<std::string> getHistory() const
     { return table_->getHistory(); }
 

trunk/src/python_asap.h

@@ -32 +32 @@
 #define PYTHON_ASAP_H
 
-class casa::AipsError;
-
 namespace asap {
   namespace python {