Changeset 995 for trunk

Timestamp:

04/06/06 13:29:19 (19 years ago)

Author:

mar637

Message:

fixes after compiling with -Wall.

Location:

trunk/src

Files:

• STMath.h (modified) (3 diffs)
• STSelector.cpp (modified) (5 diffs)
• STWriter.h (modified) (1 diff)
• STWriterWrapper.h (modified) (2 diffs)

trunk/src/STMath.h

@@ -44 +44 @@
   STMath(bool insitu=true);
 
-  ~STMath();
+  virtual ~STMath();
 
   /**
@@ -86 +86 @@
   casa::CountedPtr<Scantable>
     smooth(const casa::CountedPtr<Scantable>& in, const std::string& kernel,
-                      float width);
+                      float width);
 
   casa::CountedPtr<Scantable>
@@ -92 +92 @@
                   const std::vector<float>& coeff,
                   const std::string& fileName,
-                  const std::string& method);
+                  const std::string& method);
   casa::CountedPtr<Scantable>
     convertFlux(const casa::CountedPtr<Scantable>& in, float d,

trunk/src/STSelector.cpp

@@ -33 +33 @@
   intselections_(other.intselections_),
   stringselections_(other.stringselections_),
-  taql_(other.taql_),
   poltypes_(other.poltypes_),
-  order_(other.order_) {
+  order_(other.order_),
+  taql_(other.taql_)
+{
 }
 
@@ -110 +111 @@
 {
   order_.resize(order.size(), True);
-  for (int i=0;i<order.size();++i) {
+  for (unsigned int i=0;i<order.size();++i) {
     order_[i] = order[i];
   }
@@ -121 +122 @@
   }
   TableExprNode query;
-  intidmap::const_iterator it = intselections_.begin();
-  for (it; it != intselections_.end(); ++it) {
+  intidmap::const_iterator it;
+  for (it= intselections_.begin(); it != intselections_.end(); ++it) {
     TableExprNode theset(Vector<Int>( (*it).second ));
     if ( query.isNull() ) {
@@ -130 +131 @@
     }
   }
-  stringidmap::const_iterator it1 = stringselections_.begin();
-  for (it1; it1 != stringselections_.end(); ++it1) {
+  stringidmap::const_iterator it1;
+  for (it1 = stringselections_.begin(); it1 != stringselections_.end(); ++it1) {
     TableExprNode theset(mathutil::toVectorString( (*it1).second ));
     if ( query.isNull() ) {
@@ -243 +244 @@
   poltypes_.clear();
   std::vector<int> polints;
-  std::vector<std::string>::const_iterator strit = pols.begin();
-  for (strit; strit != pols.end(); ++strit) {
+  std::vector<std::string>::const_iterator strit;
+  for (strit = pols.begin(); strit != pols.end(); ++strit) {
     std::pair<int, std::string> val;
     try {

trunk/src/STWriter.h

@@ -56 +56 @@
 public:
   STWriter(const string &format = "SDFITS");
-  ~STWriter();
+  virtual ~STWriter();
 
   /**

trunk/src/STWriterWrapper.h

@@ -27 +27 @@
 //#                        AUSTRALIA
 //#
-//# $Id:$
+//# $Id$
 //#---------------------------------------------------------------------------
 #ifndef STWRITERWRAPPER_H
@@ -43 +43 @@
 class STWriterWrapper : public STWriter {
 public:
+  //STWriterWrapper() {;}
+  virtual ~STWriterWrapper() {;}
   STWriterWrapper(const string& format = "SDFITS") : STWriter(format) {;}