version working on mac with .tellg changed to unget for windows

[mothur.git] / fileoutput.h

diff --git a/fileoutput.h b/fileoutput.h
index d7c4726e3f3d2b13786ebcf8bf6afa792b39fe52..a047a20cffd5cb9c4ac50fbf2cf0b1bb335180cb 100644 (file)
--- a/fileoutput.h
+++ b/fileoutput.h
@@ -2,9 +2,6 @@
 #define FILEOUTPUT_H
 
 #include "mothur.h"
-#include "globaldata.hpp"
-
-using namespace std;
 
 /***********************************************************************/
 
@@ -12,7 +9,7 @@ class FileOutput {
        
 public:
        FileOutput(){};
-       ~FileOutput(){};
+       virtual ~FileOutput(){};
        
        virtual void initFile(string) = 0;
        virtual void initFile(string, vector<string>) = 0;
@@ -22,7 +19,6 @@ public:
        virtual string getFileName() = 0;
 
 protected:
-       GlobalData* globaldata;
        int renameOk;
 
 };     
@@ -129,7 +125,7 @@ private:
 class ColumnFile : public FileOutput {
        
 public:
-       ColumnFile(string n) : FileOutput(), inName(n), counter(0), outName(getPathName(n) + ".temp") { globaldata = GlobalData::getInstance(); };
+       ColumnFile(string n, string i) : FileOutput(), iters(i), inName(n), counter(0), outName(getPathName(n) + ".temp") {};
        ~ColumnFile();
        
        //to make compatible with parent class
@@ -146,6 +142,7 @@ private:
        ifstream inFile;
        ofstream outFile;
        int counter;
+       string iters;
 };
 
 /***********************************************************************/