Changeset 10694

Timestamp:

05/13/11 11:25:10 (14 years ago)

Author:

tbretz

Message:

Removed namespace defintion from header; moved obsolete includes to source file.

Location:

trunk/FACT++/src

Files:

• Fits.cc (modified) (2 diffs)
• Fits.h (modified) (3 diffs)

trunk/FACT++/src/Fits.cc

@@ -18 +18 @@
 #include "Time.h"
 #include "Converter.h"
+#include "MessageImp.h"
 
 //for file stats
@@ -23 +24 @@
 
 using namespace std;
+using namespace CCfits;
 
 // --------------------------------------------------------------------------

trunk/FACT++/src/Fits.h

@@ -6 +6 @@
 
 #include "Description.h"
-#include "MessageImp.h"
-using namespace CCfits;
 
 class Converter;
+class MessageImp;
 
 class Fits
@@ -15 +14 @@
         private:
                 ///The CCfits object to the FITS file
-                FITS* fFile;
+                CCfits::FITS* fFile;
                 ///Flag indicating whether the FITS object should be managed internally or not.
                 bool fOwner;
                 ///The CCfits Table
-                Table* fTable;
+                CCfits::Table* fTable;
                 ///The current number of Rows in the table
                 int fNumRows;
@@ -90 +89 @@
 
                 ///Opens a FITS file
-                void Open(const std::string& fileName, const std::string& tableName, FITS* file, int* fitsCounter, std::ostream& out);
+                void Open(const std::string& fileName, const std::string& tableName, CCfits::FITS* file, int* fitsCounter, std::ostream& out);
 
                 ///Write one line of data. Use the given converter.