Small fixes to compile with compaq cxx

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@812 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/ChangeLog b/ChangeLog
index e56ecd0a4c788242a2f82562be1e702090871268..a1ad739a1ca5760a5c567786481c2382919f34f5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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

diff --git a/src/LyXView.C b/src/LyXView.C
index 29d6ae71a0d3c0f13133467728908f8d09f314cc..7c2c426bf24300c885de71600cda121390e58d26 100644 (file)
--- a/src/LyXView.C
+++ b/src/LyXView.C
@@ -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

diff --git a/src/Timeout.C b/src/Timeout.C
index 1f402423c174e8a54e74d549b2d07e73989c96a4..fc0a8c50454fd57194fb57b62e63352ef6c9d7aa 100644 (file)
--- a/src/Timeout.C
+++ b/src/Timeout.C
@@ -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) {}
 

diff --git a/src/insets/ExternalTemplate.C b/src/insets/ExternalTemplate.C
index 7a4391a8175aadd226b311f66833bb7ea31ae66a..3251d0e99b78a5de2c4f2137c5a6c4a5d0112639 100644 (file)
--- a/src/insets/ExternalTemplate.C
+++ b/src/insets/ExternalTemplate.C
@@ -24,6 +24,7 @@
 
 using std::endl;
 using std::ostream;
+using std::for_each;
 
 extern string user_lyxdir;
 

diff --git a/src/lyx_main.h b/src/lyx_main.h
index b37acb2dbc246db3bd7d8bee4790227a3e06b631..c992dfc80aa9276034194f401fe4968db0735370 100644 (file)
--- a/src/lyx_main.h
+++ b/src/lyx_main.h
@@ -66,8 +66,8 @@ private:
        bool first_start;
        ///
        string batch_command;
-       ///
-       struct sigaction act_;
+       /// 
+       // struct sigaction act_; // seems to be unused
        //@}
        /**@name Private Members */
        //@{