X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Finput.h;h=6cc53e7af3674ee31fbd18bbff24e3d699830294;hb=HEAD;hp=a9c96f48abce9cdf9e533e640f3913c8849e0d7f;hpb=9fd9af66cf20cdc3d217f273835410eb2c8c362b;p=libs%2Fdatafile.git

diff --git a/source/input.h b/source/input.h
index a9c96f4..6cc53e7 100644
--- a/source/input.h
+++ b/source/input.h
@@ -1,18 +1,19 @@
 #ifndef MSP_DATAFILE_INPUT_H_
 #define MSP_DATAFILE_INPUT_H_
 
+#include <msp/core/noncopyable.h>
 #include <msp/io/base.h>
 
 namespace Msp {
 namespace DataFile {
 
-class Input
+class Input: private NonCopyable
 {   
 private:
-	IO::Base *in;
-	IO::Base *compressed;
-	unsigned line;
-	int next;
+	IO::Base *in = nullptr;
+	IO::Base *compressed = nullptr;
+	unsigned line = 1;
+	int next = -1;
 
 public:
 	Input(IO::Base &); 
@@ -22,7 +23,7 @@ public:
 	int get();
 	int peek();
 	unsigned get_line_number() const { return line; }
-	operator bool() const;
+	explicit operator bool() const;
 };  
 
 } // namespace DataFile