Remove wmf2eps as EMF > EPS converter

[lyx.git] / src / tex2lyx / Parser.h

diff --git a/src/tex2lyx/Parser.h b/src/tex2lyx/Parser.h
index 67dd0b2457c297eb76c2181c540b73a071d630f8..cbdfcf723470a88a2cc2825db046172487b405c5 100644 (file)
--- a/src/tex2lyx/Parser.h
+++ b/src/tex2lyx/Parser.h
@@ -125,10 +125,9 @@ public:
 
        iparserdocstream(idocstream & is) : is_(is) {}
 
-       /// Like std::istream::operator void*()
+       /// Like std::istream::operator bool()
        /// Do not convert is_ implicitly to bool, since that is forbidden in C++11.
-       /// FIXME: Convert to operator void*() in LyX 2.2
-       operator bool() const { return s_.empty() ? !is_.fail() : true; }
+       explicit operator bool() const { return s_.empty() ? !is_.fail() : true; }
 
        /// change the encoding of the input stream to \p e (iconv name)
        void setEncoding(std::string const & e);
@@ -287,7 +286,7 @@ public:
         * found and the member \p second is the value. If \p
         * allow_linebreak is false, then the parsing is limited to one line
         */
-       Arg verbatimStuff(std::string const & end_string, 
+       Arg verbatimStuff(std::string const & end_string,
                          bool allow_linebreak = true);
        /*
         * \returns the contents of the environment \p name.