Move the definition of Input's operator bool to the header

The class should be considered as internal, but Parser invokes the bool
conversion from its own.  This avoids having to export Input.

diff --git a/source/input.cpp b/source/input.cpp
index 8aec39e4aa82ef6ad47506f84c4dbdf91eafd18a..4496439fcd393d3898dba41c8d48a0fcba2c245c 100644 (file)
--- a/source/input.cpp
+++ b/source/input.cpp
@@ -39,10 +39,5 @@ int Input::peek()
        return next;
 }
 
-Input::operator bool() const
-{
-       return next>=0 || !in->eof();
-}
-
 } // namespace DataFile
 } // namespace Msp

diff --git a/source/input.h b/source/input.h
index 6cc53e7af3674ee31fbd18bbff24e3d699830294..7f4dd7b988a3b988911797cde037ab733658e84e 100644 (file)
--- a/source/input.h
+++ b/source/input.h
@@ -23,7 +23,7 @@ public:
        int get();
        int peek();
        unsigned get_line_number() const { return line; }
-       explicit operator bool() const;
+       explicit operator bool() const { return (next>=0 || !in->eof()); }
 };  
 
 } // namespace DataFile