Cmake build: Omit also hidden header files from globbing

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

diff --git a/src/tex2lyx/Parser.h b/src/tex2lyx/Parser.h
index 67dd0b2457c297eb76c2181c540b73a071d630f8..9778765ed6f2dce76c8c244f16e13576a64ae9ea 100644 (file)
--- a/src/tex2lyx/Parser.h
+++ b/src/tex2lyx/Parser.h
@@ -125,10 +125,15 @@ public:
 
        iparserdocstream(idocstream & is) : is_(is) {}
 
-       /// Like std::istream::operator void*()
+#if (__cplusplus > 199711L)
+       /// 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; }
+#else
+       /// Like std::istream::operator void*()
+       operator void*() const { return (s_.empty() && is_.fail()) ?
+                       0 : const_cast<iparserdocstream *>(this); }
+#endif
 
        /// change the encoding of the input stream to \p e (iconv name)
        void setEncoding(std::string const & e);