X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mothurout.h;h=bf356ae285fba010f41f2bbc51b9ce093ead1b1b;hb=a86aff4f80701bf0d436f02c0095920114e1cba2;hp=d2ba6b94f0b12a6bd31df7763e0d4b32d705d3ea;hpb=a8367302932de9be5434e77f6e5829d7609e2aec;p=mothur.git

diff --git a/mothurout.h b/mothurout.h
index d2ba6b9..bf356ae 100644
--- a/mothurout.h
+++ b/mothurout.h
@@ -1,46 +1,48 @@
-#ifndef MOTHUROUT_H
-#define MOTHUROUT_H
-
-/*
- *  mothurOut.h
- *  Mothur
- *
- *  Created by westcott on 2/25/10.
- *  Copyright 2010 Schloss Lab. All rights reserved.
- *
- */
-
-#include "mothur.h"
-
-/***********************************************/
-
-class MothurOut {
-	
-	public:
-		static MothurOut* getInstance();
-		void setFileName(string);
-		
-		void mothurOut(string);
-		void mothurOutEndLine();
-		void mothurOutJustToLog(string);
-		void errorOut(exception&, string, string);
-		void closeLog();
-
-		int control_pressed;
-		bool executing;
-
-	private:
-		static MothurOut* _uniqueInstance;
-		MothurOut( const MothurOut& ); // Disable copy constructor
-		void operator=( const MothurOut& ); // Disable assignment operator
-		MothurOut() { control_pressed = false; };
-		~MothurOut();
-
-		string logFileName;
-		ofstream out;
-
-};
-/***********************************************/
-
-#endif
-
+#ifndef MOTHUROUT_H
+#define MOTHUROUT_H
+
+/*
+ *  mothurOut.h
+ *  Mothur
+ *
+ *  Created by westcott on 2/25/10.
+ *  Copyright 2010 Schloss Lab. All rights reserved.
+ *
+ */
+
+#include "mothur.h"
+
+/***********************************************/
+
+class MothurOut {
+	
+	public:
+		static MothurOut* getInstance();
+		void setFileName(string);
+		
+		void mothurOut(string);
+		void mothurOutEndLine();
+		void mothurOutJustToLog(string);
+		void errorOut(exception&, string, string);
+		void closeLog();
+
+		int control_pressed;
+		bool executing;
+
+	private:
+		static MothurOut* _uniqueInstance;
+		MothurOut( const MothurOut& ); // Disable copy constructor
+		void operator=( const MothurOut& ); // Disable assignment operator
+		MothurOut() { control_pressed = false; };
+		~MothurOut();
+
+		string logFileName;
+		ofstream out;
+		
+		int mem_usage(double&, double&);
+
+};
+/***********************************************/
+
+#endif
+