+2003-10-23 Lars Gullik Bjønnes <larsbj@gullik.net>
+
+ * libs/regex/src/cpp_regex_traits.cpp (seekpos): use correct
+ types. same patch sent to boost list and accepted there.
+
2003-10-07 Angus Leeming <leeming@lyx.org>
* boost/any.hpp: change the throw to boost::throw_exception.
* provided that the above copyright notice appear in all copies and
* that both that copyright notice and this permission notice appear
* in supporting documentation. Dr John Maddock makes no representations
- * about the suitability of this software for any purpose.
+ * about the suitability of this software for any purpose.
* It is provided "as is" without express or implied warranty.
*
*/
-
+
/*
* LOCATION: see http://www.boost.org for most recent version.
* FILE: c_regex_traits.cpp
return pos_type(off_type(-1));
std::ptrdiff_t size = this->egptr() - this->eback();
charT* g = this->eback();
- if(sp <= size)
+ if(off_type(sp) <= size)
{
- this->setg(g, g + ::std::streamsize(sp), g + size);
+ this->setg(g, g + off_type(sp), g + size);
}
return pos_type(off_type(-1));
}
#else
BOOST_REGEX_NOEH_ASSERT(cat >= 0);
#endif
- }
+ }
#endif
std::memset(syntax_map, cpp_regex_traits<char>::syntax_char, 256);
unsigned i;
if((int)cat >= 0)
msgs.close(cat);
-#endif
+#endif
}
} // namespace re_detail
} // namespace boost
#endif
-
-
+2003-10-23 Lars Gullik Bjønnes <larsbj@gullik.net>
+
+ * lyxlex_pimpl.C (setFile,setStream): be sure to use correct types
+ when woring with stream::pos_type
+ * paragraph_pimpl.C (simpleTeXSpecialChars): ditto
2003-10-22 André Pönitz <poenitz@gmx.net>
2003-10-22 Martin Vermeer <martin.vermeer@hut.fi>
- * text.C: fixed an "oops" in the "is a bit silly"
+ * text.C: fixed an "oops" in the "is a bit silly"
bug fix
2003-10-21 André Pönitz <poenitz@gmx.net>
2003-10-20 Martin Vermeer <martin.vermeer@hut.fi>
* text.C: re-introduce display() for insets, fixing the
- various bugs (stretch of line above, math inset
+ various bugs (stretch of line above, math inset
positioning, ...)
2003-10-20 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
// The check only outputs a debug message, because it triggers
// a bug in compaq cxx 6.2, where is_open() returns 'true' for
// a fresh new filebuf. (JMarc)
- if (gz__.is_open() || is.tellg() > 0)
+ if (gz__.is_open() || istream::off_type(is.tellg()) > -1)
lyxerr[Debug::LYXLEX] << "Error in LyXLex::setFile: "
"file or stream already set." << endl;
gz__.open(filename.c_str(), ios::in);
// The check only outputs a debug message, because it triggers
// a bug in compaq cxx 6.2, where is_open() returns 'true' for
// a fresh new filebuf. (JMarc)
- if (fb__.is_open() || is.tellg() > 0)
+ if (fb__.is_open() || istream::off_type(is.tellg()) > 0)
lyxerr[Debug::LYXLEX] << "Error in LyXLex::setFile: "
"file or stream already set." << endl;
fb__.open(filename.c_str(), ios::in);
void LyXLex::Pimpl::setStream(istream & i)
{
- if (fb__.is_open() || is.tellg() > 0)
+ if (fb__.is_open() || istream::off_type(is.tellg()) > 0)
lyxerr[Debug::LYXLEX] << "Error in LyXLex::setStream: "
"file or stream already set." << endl;
is.rdbuf(i.rdbuf());
}
bool close = false;
- int const len = os.tellp();
- //ostream::pos_type const len = os.tellp();
+ ostream::pos_type const len = os.tellp();
+
if ((inset->lyxCode() == InsetOld::GRAPHICS_CODE
|| inset->lyxCode() == InsetOld::MATH_CODE
|| inset->lyxCode() == InsetOld::URL_CODE)
texrow.start(owner_->id(), i + 1);
column = 0;
} else {
- column += int(os.tellp()) - len;
+ column += os.tellp() - len;
}
}
break;