X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=fileoutput.h;h=a047a20cffd5cb9c4ac50fbf2cf0b1bb335180cb;hb=02909d6cae9963ba00dc746969a370fa8ca934fc;hp=209dd1b1772cc1f58e18cce4826ffcddd541d278;hpb=0470f6d037aacb3563c3f7010708120a4a67d4e6;p=mothur.git diff --git a/fileoutput.h b/fileoutput.h index 209dd1b..a047a20 100644 --- a/fileoutput.h +++ b/fileoutput.h @@ -2,7 +2,6 @@ #define FILEOUTPUT_H #include "mothur.h" -#include "globaldata.hpp" /***********************************************************************/ @@ -10,7 +9,7 @@ class FileOutput { public: FileOutput(){}; - ~FileOutput(){}; + virtual ~FileOutput(){}; virtual void initFile(string) = 0; virtual void initFile(string, vector) = 0; @@ -20,7 +19,6 @@ public: virtual string getFileName() = 0; protected: - GlobalData* globaldata; int renameOk; }; @@ -127,7 +125,7 @@ private: class ColumnFile : public FileOutput { public: - ColumnFile(string n, string i) : FileOutput(), iters(i), 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