X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=sharedlistvector.h;h=56ea802a1b1bca511454f83ddcb9e8f29bd5ed27;hb=e0ce7cbc93d7d2fbb753ca694182db092a0ea0e7;hp=2c8d01bf4c257a715f789412a4391169138af9b6;hpb=753dc84cf289b1d5dc0ca5b0c043640927aa951a;p=mothur.git diff --git a/sharedlistvector.h b/sharedlistvector.h index 2c8d01b..56ea802 100644 --- a/sharedlistvector.h +++ b/sharedlistvector.h @@ -12,7 +12,6 @@ #include "datavector.hpp" #include "groupmap.h" -#include "globaldata.hpp" #include "sharedrabundvector.h" #include "sharedsabundvector.h" @@ -33,8 +32,8 @@ public: SharedListVector(); SharedListVector(int); SharedListVector(ifstream&); - SharedListVector(const SharedListVector& lv) : DataVector(lv.label), data(lv.data), maxRank(lv.maxRank), numBins(lv.numBins), numSeqs(lv.numSeqs){globaldata = GlobalData::getInstance();}; - ~SharedListVector(){}; + SharedListVector(const SharedListVector& lv) : DataVector(lv.label), data(lv.data), maxRank(lv.maxRank), numBins(lv.numBins), numSeqs(lv.numSeqs){ groupmap = NULL; }; + ~SharedListVector(){ if (groupmap != NULL) { delete groupmap; } }; int getNumBins() { return numBins; } int getNumSeqs() { return numSeqs; } @@ -58,7 +57,6 @@ public: private: vector data; //data[i] is a list of names of sequences in the ith OTU. - GlobalData* globaldata; GroupMap* groupmap; int maxRank; int numBins;