Changeset 1030 for trunk/src

Timestamp:

04/23/06 20:29:45 (19 years ago)

Author:

mar637

Message:

Various fixes to make >=gcc-3.4 compliant

Location:

trunk/src

Files:

• Logger.cpp (modified) (1 diff)
• Logger.h (modified) (1 diff)
• MathUtils.h (modified) (2 diffs)
• STAsciiWriter.h (modified) (1 diff)
• STAttr.h (modified) (1 diff)
• STHeader.h (modified) (2 diffs)
• Scantable.h (modified) (1 diff)

trunk/src/Logger.cpp

@@ -13 +13 @@
 {
   enabled_ = enabled;
+}
+Logger::~Logger()
+{
 }
 

trunk/src/Logger.h

@@ -10 +10 @@
 public:
   Logger();
+  virtual ~Logger();
   Logger(bool enabled);
   void pushLog(const std::string& s, bool newline=true) const;

trunk/src/MathUtils.h

@@ -27 +27 @@
 //#                        AUSTRALIA
 //#
-//# $Id:
+//# $Id:$
 //#---------------------------------------------------------------------------
 #ifndef MATHUTILS_H
@@ -80 +80 @@
 casa::Vector<casa::String> toVectorString(const std::vector<std::string>& in);
 
-};
+}
 
 #endif

trunk/src/STAsciiWriter.h

@@ -39 +39 @@
 #include "Logger.h"
 
-template<class T> class casa::Vector;
-class casa::MDirection;
+namespace casa {
+  template<class T> class Vector;
+  class MDirection;
+}
 
 namespace asap {

trunk/src/STAttr.h

@@ -39 +39 @@
 #include "STDefs.h"
 
-template<class T> class casa::Vector;
-
+namespace casa {
+  template<class T> class Vector;
+}
 
 namespace asap {

trunk/src/STHeader.h

@@ -27 +27 @@
 //#                        AUSTRALIA
 //#
-//# $Id:
+//# $Id:$
 //#---------------------------------------------------------------------------
 #ifndef STHEADER_H
@@ -40 +40 @@
 #include <measures/Measures/MDirection.h>
 
-template<class T> class casa::Matrix;
+namespace casa {
+  template<class T> class Matrix;
+}
 
 namespace asap {

trunk/src/Scantable.h

@@ -369 +369 @@
   int rowToScanIndex(int therow);
 
-  static const unsigned int version_ = 2;
+  static const casa::uInt version_ = 2;
 
   STSelector selector_;