some changes while testing 1.9

[mothur.git] / mothurout.h

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