+2000-09-15 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
+
+ * src/lyxfunc.C: construct correctly the automatic new file
+ names.
+
+ * src/text2.C (IsStringInText): change type of variable i to shut
+ off a warning.
+
+ * src/support/sstream.h: do not use namespaces if the compiler
+ does not support them.
+
2000-09-15 Marko Vendelin <markov@ioc.ee>
* src/frontends/gnome/FormCitation.C
* src/frontends/gnome/FormCitation.h
2000-09-15 Marko Vendelin <markov@ioc.ee>
* src/frontends/gnome/FormCitation.C
* src/frontends/gnome/FormCitation.h
- s = lyxrc.document_path + "newfile" + tostr(++newfile_number);
+ s = AddPath(lyxrc.document_path,
+ "newfile" + tostr(++newfile_number));
FileInfo fi(s);
while (bufferlist.exists(s) || fi.readable()) {
++newfile_number;
FileInfo fi(s);
while (bufferlist.exists(s) || fi.readable()) {
++newfile_number;
- s = lyxrc.document_path + "newfile" +
- tostr(newfile_number);
+ s = AddPath(lyxrc.document_path,
+ "newfile" + tostr(newfile_number));
and with lyxstring. Dynamic casts have been replaced by static_casts.
One fix to avoid unsigned/signed warnings.
and with lyxstring. Dynamic casts have been replaced by static_casts.
One fix to avoid unsigned/signed warnings.
- Some further changes might be needed to avoid use of namespaces.
-
Lars Gullik Bjønnes (larsbj@lyx.org)
*/
Lars Gullik Bjønnes (larsbj@lyx.org)
*/
#include <iostream>
#include <streambuf.h>
#include <iostream>
#include <streambuf.h>
+#ifdef CXX_WORKING_NAMESPACES
class stringbuf : public streambuf
{
public:
class stringbuf : public streambuf
{
public:
stringstreambase(s, which)
{ }
};
stringstreambase(s, which)
{ }
};
+
+#ifdef CXX_WORKING_NAMESPACES
inline int stringbuf::sync()
{
inline int stringbuf::sync()
{
string const & str) const
{
if (par) {
string const & str) const
{
if (par) {
+ LyXParagraph::size_type i = 0;
while (pos + i < par->Last() && i < str.length()&&
str[i] == par->GetChar(pos + i)) {
++i;
while (pos + i < par->Last() && i < str.length()&&
str[i] == par->GetChar(pos + i)) {
++i;