anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-19 22:40:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Small fixes to compile with compaq cxx

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@812 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2000-06-13 10:33:57 +00:00
parent 6661712fbc
commit a0911c75d0
5 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,3 +1,15 @@
2000-06-13 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* src/Timeout.C (TimeOut): remove default argument.
* src/LyXView.C (LyXView_AutosaveTimerCB): this should not have
"C" linkage.
* src/insets/ExternalTemplate.C: add a "using" directive.
* src/lyx_main.h: remove the act_ struct, which seems unused
anyway.
2000-06-12 Lars Gullik Bjønnes <larsbj@lyx.org>
* LyX Developers Meeting: All files changed, due to random C++ (by

14
src/LyXView.C
View File

@ -158,13 +158,11 @@ void LyXView::AutoSave()
// Wrapper for the above
extern "C" {
static
void C_LyXView_AutosaveTimerCB(void * ob)
{
LyXView * view = static_cast<LyXView*>(ob);
view->AutoSave();
}
static
void LyXView_AutosaveTimerCB(void * ob)
{
LyXView * view = static_cast<LyXView*>(ob);
view->AutoSave();
}
/// Reset autosave timer
@ -265,7 +263,7 @@ void LyXView::create_form_form_main(int width, int height)
// TIMERS
//
autosave_timeout.callback(C_LyXView_AutosaveTimerCB, this);
autosave_timeout.callback(LyXView_AutosaveTimerCB, this);
//
// Misc

2
src/Timeout.C
View File

@ -22,7 +22,7 @@ Timeout::Timeout()
callback_(0), data_(0) {}
Timeout::Timeout(int msec, Type t = ONETIME)
Timeout::Timeout(int msec, Type t)
: type(t), timeout(msec), timeout_id(-1),
callback_(0), data_(0) {}

1
src/insets/ExternalTemplate.C
View File

@ -24,6 +24,7 @@
using std::endl;
using std::ostream;
using std::for_each;
extern string user_lyxdir;

4
src/lyx_main.h
View File

@ -66,8 +66,8 @@ private:
bool first_start;
///
string batch_command;
///
struct sigaction act_;
///
// struct sigaction act_; // seems to be unused
//@}
/**@name Private Members */
//@{