mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-25 10:58:52 +00:00
the mkfifo change, make it compile on egcs
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1103 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
e7401bd8f2
commit
95fdfb772b
12
ChangeLog
12
ChangeLog
@ -1,3 +1,15 @@
|
||||
2000-10-12 <larsbj@baywatch.lyx.org>
|
||||
|
||||
* src/support/lyxfunctional.h: add operator= that takes a reference
|
||||
|
||||
* src/lyxserver.C (mkfifo): make first arg const
|
||||
|
||||
* src/layout.h: renamed name(...) to setName(...) to work around
|
||||
bugs in egcs.
|
||||
|
||||
* src/buffer.C (setFileName): had to change name of function to
|
||||
work around bugs in egcs. (renamed from fileName)
|
||||
|
||||
2000-10-11 Lars Gullik Bjønnes <larsbj@lyx.org>
|
||||
|
||||
* src/support/translator.h: move helper template clsses to
|
||||
|
@ -26,9 +26,7 @@ src/frontends/kde/formcitationdialog.C
|
||||
src/frontends/kde/FormCopyright.C
|
||||
src/frontends/kde/FormIndex.C
|
||||
src/frontends/kde/formindexdialog.C
|
||||
src/frontends/kde/formindexdialogdata.C
|
||||
src/frontends/kde/FormPrint.C
|
||||
src/frontends/kde/formprintdialogdata.C
|
||||
src/frontends/kde/FormRef.C
|
||||
src/frontends/kde/formrefdialog.C
|
||||
src/frontends/kde/FormToc.C
|
||||
|
@ -219,7 +219,7 @@ void Buffer::resetAutosaveTimers() const
|
||||
}
|
||||
|
||||
|
||||
void Buffer::fileName(string const & newfile)
|
||||
void Buffer::setFileName(string const & newfile)
|
||||
{
|
||||
filename = MakeAbsPath(newfile);
|
||||
filepath = OnlyPath(filename);
|
||||
|
@ -236,7 +236,7 @@ public:
|
||||
string const getLatexName(bool no_path = true) const;
|
||||
|
||||
/// Change name of buffer. Updates "read-only" flag.
|
||||
void fileName(string const & newfile);
|
||||
void setFileName(string const & newfile);
|
||||
|
||||
/// Name of the document's parent
|
||||
void setParentName(string const &);
|
||||
|
@ -871,7 +871,7 @@ bool LyXTextClass::Read(string const & filename, bool merge)
|
||||
error = do_readStyle(lexrc, lay);
|
||||
} else {
|
||||
LyXLayout lay;
|
||||
lay.name(name);
|
||||
lay.setName(name);
|
||||
if (!(error = do_readStyle(lexrc, lay)))
|
||||
layoutlist.push_back(lay);
|
||||
}
|
||||
|
@ -210,7 +210,7 @@ public:
|
||||
///
|
||||
string const & name() const { return name_; }
|
||||
///
|
||||
void name(string const & n) { name_ = n; }
|
||||
void setName(string const & n) { name_ = n; }
|
||||
///
|
||||
string const & obsoleted_by() const { return obsoleted_by_; }
|
||||
///
|
||||
|
@ -254,7 +254,7 @@ bool MenuWriteAs(Buffer * buffer)
|
||||
bufferlist.close(bufferlist.getBuffer(s));
|
||||
|
||||
// Ok, change the name of the buffer, but don't save!
|
||||
buffer->fileName(s);
|
||||
buffer->setFileName(s);
|
||||
buffer->markDirty();
|
||||
|
||||
ShowMessage(buffer, _("Document renamed to '"),
|
||||
@ -271,7 +271,7 @@ bool MenuWriteAs(Buffer * buffer)
|
||||
}
|
||||
|
||||
// Ok, change the name of the buffer
|
||||
buffer->fileName(s);
|
||||
buffer->setFileName(s);
|
||||
buffer->markDirty();
|
||||
bool unnamed = buffer->isUnnamed();
|
||||
buffer->setUnnamed(false);
|
||||
@ -280,7 +280,7 @@ bool MenuWriteAs(Buffer * buffer)
|
||||
// of the document.
|
||||
// Hope this is fixed this way! (Jug)
|
||||
if (!MenuWrite(buffer)) {
|
||||
buffer->fileName(oldname);
|
||||
buffer->setFileName(oldname);
|
||||
buffer->setUnnamed(unnamed);
|
||||
ShowMessage(buffer, _("Document could not be saved!"),
|
||||
_("Holding the old name."), MakeDisplayPath(oldname));
|
||||
|
@ -72,8 +72,8 @@ using std::endl;
|
||||
// provide an empty mkfifo() if we do not have one. This disables the
|
||||
// lyxserver.
|
||||
#ifndef HAVE_MKFIFO
|
||||
int mkfifo( char *__path, mode_t __mode ) {
|
||||
return 0;
|
||||
int mkfifo(char const * __path, mode_t __mode ) {
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
|
@ -41,6 +41,12 @@ public:
|
||||
return *this;
|
||||
}
|
||||
|
||||
back_insert_fun_iterator &
|
||||
operator=(Type & val) {
|
||||
container.push_back((val.*pmf)());
|
||||
return *this;
|
||||
}
|
||||
|
||||
back_insert_fun_iterator & operator*() {
|
||||
return *this;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user