Compaq cxx 6.5 will now compile lyx.

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

diff --git a/src/BufferView_pimpl.C b/src/BufferView_pimpl.C
index e0a6b0157c7ba363054001552e6be7770a18d58f..d527df560856f95fda66d7e3bb485ca58803dacc 100644 (file)
--- a/src/BufferView_pimpl.C
+++ b/src/BufferView_pimpl.C
@@ -76,6 +76,14 @@
 
 extern string current_layout;
 
+#ifndef CXX_GLOBAL_CSTD
+using std::tm;
+using std::localtime;
+using std::time;
+using std::setlocale;
+using std::strftime;
+#endif
+
 using std::vector;
 using std::find_if;
 using std::find;

diff --git a/src/ChangeLog b/src/ChangeLog
index ef7c28c92cb7ca4109b8e5be15ec02f9056bd39f..6d5baed575ffe3af679ac32fa4bdfd957416a1ee 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,40 @@
+2002-06-07  Angus Leeming  <leeming@lyx.org>
+
+       Fixes needed to compile with Compaq cxx 6.5.
+       * BufferView_pimpl.C:
+       * DepTable.C:
+       * buffer.C:
+       * converter.C:
+       * encoding.C:
+       * lyx_gui.C:
+       * lyx_main.C:
+       * lyxtextclasslist.C:
+       * minibuffer.C:
+       * sp_spell.C:
+       * tabular_funcs.C:
+       * vc-backend.C:
+       all c-library variables have been moved into namespace std. Wrap
+       using std::xyz declarations inside a #ifndef CXX_GLOBAL_CSTD block.
+
+       * lyxlength.C:
+       * tabular-old.C:
+       * tabular.C:
+       Add a using std::abs declaration.
+       
+       * kbmap.h (modifier_pair):
+       * paragraph.h (InsetTable, InsetList):
+       * lyxfont.h (FontBits):
+       type definition made public.
+
+       * bufferlist.C (emergencyWriteAll): the compiler complains that
+       there is more than one possible lyx::class_fun template to choose from.
+       I re-named the void specialisation as lyx::void_class_fun.
+
+       * lyxfont.C (FontBits' operator==, operator!=): taken out of class.
+
+       * tabular_funcs.C: lstrings.h must come before tabular_funcs.h or
+       the compiler is is unable to find tostr in write_attribute.
+
 2002-06-06  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
 
        * buffer.C (sgmlError): hide #warning

diff --git a/src/DepTable.C b/src/DepTable.C
index fecf867d8ddc25d29aed84c18cdc9dc35662e6d5..dd487fcd39a1ec27702d19a6b9c6e63411a4d030 100644 (file)
--- a/src/DepTable.C
+++ b/src/DepTable.C
@@ -32,6 +32,10 @@
 #include <fstream>
 #include <ctime>
 
+#ifndef CXX_GLOBAL_CSTD
+using std::time;
+#endif
+
 using std::make_pair;
 using std::ofstream;
 using std::ifstream;

diff --git a/src/buffer.C b/src/buffer.C
index 2ca003dd6d243a71288ddd8ffae0773fe0248a80..95912feaeab49a280436490b8ae52e43d46ff85a 100644 (file)
--- a/src/buffer.C
+++ b/src/buffer.C
@@ -110,6 +110,9 @@
 #include <locale>
 #endif
 
+#ifndef CXX_GLOBAL_CSTD
+using std::pow;
+#endif
 
 using std::ostream;
 using std::ofstream;

diff --git a/src/bufferlist.C b/src/bufferlist.C
index e93dddae8923d75c21aa1b544488afd29c4f3d98..fc642d8c1d441fa9539fef25ccb07e10105e2882 100644 (file)
--- a/src/bufferlist.C
+++ b/src/bufferlist.C
@@ -294,7 +294,7 @@ void BufferList::updateIncludedTeXfiles(string const & mastertmpdir)
 void BufferList::emergencyWriteAll()
 {
        for_each(bstore.begin(), bstore.end(),
-                lyx::class_fun(*this, &BufferList::emergencyWrite));
+                lyx::void_class_fun(*this, &BufferList::emergencyWrite));
 }
 
 

diff --git a/src/converter.C b/src/converter.C
index e2f662dce456f01fdc2d6fff2800d8b99cfd2cad..83a0541b608afe4873091f160536bb1a64618864 100644 (file)
--- a/src/converter.C
+++ b/src/converter.C
@@ -34,6 +34,10 @@
 #include "support/path.h"
 #include "support/systemcall.h"
 
+#ifndef CXX_GLOBAL_CSTD
+using std::isdigit;
+#endif
+
 using std::vector;
 using std::queue;
 using std::endl;

diff --git a/src/encoding.C b/src/encoding.C
index 9d12136428ad2f54bc2efd852da2797cd5bb2442..697adab956930dc65967dd332541beb024b52c77 100644 (file)
--- a/src/encoding.C
+++ b/src/encoding.C
@@ -17,6 +17,10 @@
 #include "encoding.h"
 #include "debug.h"
 
+#ifndef CXX_GLOBAL_CSTD
+using std::strtol;
+#endif
+
 using std::endl;
 
 Encodings encodings;

diff --git a/src/frontends/Alert.C b/src/frontends/Alert.C
index e351d116bc970bda7dbc314b40a5e0223bb12757..d85ba7c22d4d7ed61e736ad1437eb62c14f728a1 100644 (file)
--- a/src/frontends/Alert.C
+++ b/src/frontends/Alert.C
@@ -17,6 +17,10 @@
 
 #include <cerrno>
 
+#ifndef CXX_GLOBAL_CSTD
+using std::strerror;
+#endif
+
 using std::endl;
 using std::pair;
 using std::make_pair;

diff --git a/src/frontends/ChangeLog b/src/frontends/ChangeLog
index 71ef133500a59d229b984cd31f8b39b62d24e438..e7a8356b32c1164e35839a7d3d733531a31e320b 100644 (file)
--- a/src/frontends/ChangeLog
+++ b/src/frontends/ChangeLog
@@ -1,3 +1,11 @@
+2002-06-07  Angus Leeming  <leeming@lyx.org>
+
+       Fixes needed to compile with Compaq cxx 6.5.
+       * Alert.C: all c-library variables have been moved into namespace std.
+       Wrap using std::xyz declarations inside a #ifndef CXX_GLOBAL_CSTD block.
+
+       * Toolbar.h (Pimpl): type definition made public.
+
 2002-05-31  John Levon  <moz@compsoc.man.ac.uk>
 
        * Alert.h: better variable name

diff --git a/src/frontends/Toolbar.h b/src/frontends/Toolbar.h
index 0f15083bc0bfdd389272da5b3a85e30de4e9fa25..3ef7dcb85afcd863bba1a35e917767a57d001617 100644 (file)
--- a/src/frontends/Toolbar.h
+++ b/src/frontends/Toolbar.h
@@ -62,8 +62,9 @@ public:
        /// Erase the layout list
        void clearLayoutList();
 
-private:
+       /// Compaq cxx 6.5 requires this to be public
        struct Pimpl;
+private:
        ///
        friend struct Toolbar::Pimpl;
        ///

diff --git a/src/frontends/controllers/ChangeLog b/src/frontends/controllers/ChangeLog
index e79e2196057fbee3614352f72d82725eb376ce49..3c59b46845a2d2ebf2f41fb17f84bc2f80261666 100644 (file)
--- a/src/frontends/controllers/ChangeLog
+++ b/src/frontends/controllers/ChangeLog
@@ -1,3 +1,11 @@
+2002-06-07  Angus Leeming  <leeming@lyx.org>
+
+       Fixes needed to compile with Compaq cxx 6.5.
+       * ControlDialog.tmpl: I have had to prefix base class methods with
+       Base:: Wierd!
+
+       * ControlInset.tmpl: #include a couple of headers.
+
 2002-05-29  Lars Gullik Bjønnes  <larsbj@birdstep.com>
 
        * switch from SigC signals to boost::signals

diff --git a/src/frontends/controllers/ControlDialog.tmpl b/src/frontends/controllers/ControlDialog.tmpl
index 50a90f371c14cc32e6a90bb9adc69bdd9778b856..5e7390360a82c8ab391d84426302b5ff5b6f9b27 100644 (file)
--- a/src/frontends/controllers/ControlDialog.tmpl
+++ b/src/frontends/controllers/ControlDialog.tmpl
@@ -13,7 +13,7 @@
 #include "ControlDialog.h"
 #include "ButtonControllerBase.h"
 #include "ControlConnections.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include "BufferView.h"
 #include "ViewBase.h"
 #include "debug.h"
@@ -27,49 +27,49 @@ ControlDialog<Base>::ControlDialog(LyXView & lv, Dialogs & d)
 template <class Base>
 void ControlDialog<Base>::show()
 {
-       if (isBufferDependent() && !lv_.view()->available())
+       if (Base::isBufferDependent() && !Base::lv_.view()->available())
                return;
 
-       connect();
+       Base::connect();
 
        setParams();
-       if (emergency_exit_) {
+       if (Base::emergency_exit_) {
                hide();
                return;
        }
 
        if (!dialog_built_) {
-               view().build();
+               Base::view().build();
                dialog_built_ = true;
        }
 
-       bc().readOnly(isReadonly());
-       view().show();
+       Base::bc().readOnly(Base::isReadonly());
+       Base::view().show();
 }
 
 template <class Base>
 void ControlDialog<Base>::update()
 {
-       if (isBufferDependent() && !lv_.view()->available())
+       if (Base::isBufferDependent() && !Base::lv_.view()->available())
                return;
 
        setParams();
-       if (emergency_exit_) {
+       if (Base::emergency_exit_) {
                hide();
                return;
        }
 
-       bc().readOnly(isReadonly());
-       view().update();
+       Base::bc().readOnly(Base::isReadonly());
+       Base::view().update();
 }
 
 template <class Base>
 void ControlDialog<Base>::hide()
 {
-       emergency_exit_ = false;
+       Base::emergency_exit_ = false;
        clearParams();
 
-       disconnect();
-       view().hide();
+       Base::disconnect();
+       Base::view().hide();
 }
 

diff --git a/src/frontends/controllers/ControlInset.tmpl b/src/frontends/controllers/ControlInset.tmpl
index ac7436848b54b60ec49f88d75cef40b1ae6d878c..7b89da6ce14063fe24b715fbf07cbd89854ed061 100644 (file)
--- a/src/frontends/controllers/ControlInset.tmpl
+++ b/src/frontends/controllers/ControlInset.tmpl
@@ -11,10 +11,12 @@
  */
 
 #include "ControlInset.h"
+#include "ViewBase.h"
+#include "buffer.h"
 #include "debug.h"
-
+#include "frontends/LyXView.h"
 #include "support/LAssert.h"
-
+#include <boost/bind.hpp>
 
 template <class Inset, class Params>
 ControlInset<Inset, Params>::ControlInset(LyXView & lv, Dialogs & d)

diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index 4ff06fa11f5516e420523e5017a1a449691407e2..84d783a1e5cd9a0985bce4bf5c70abfc090917d6 100644 (file)
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,3 +1,17 @@
+2002-06-07  Angus Leeming  <leeming@lyx.org>
+
+       Fixes needed to compile with Compaq cxx 6.5.
+       * ColorHandler.C:
+       * DropDown.C:
+       * FormThesaurus.C:
+       all c-library variables have been moved into namespace std.
+       Wrap using std::xyz declarations inside a #ifndef CXX_GLOBAL_CSTD block.
+
+       * XFormsView.C: add a using std::abs directive.
+
+       * FormBase.h (FormCB::controller): I have had to prefix base class
+       methods with Base:: Wierd!
+
 2002-06-04  John Levon  <moz@compsoc.man.ac.uk>
 
        * xformsGImage.h: an xforms build fix

diff --git a/src/frontends/xforms/Color.C b/src/frontends/xforms/Color.C
index bbf9d5708752df19c5f5c5ba6c62e22cd03bfaca..abf64c63751ec2a0bfd5e412c235336e849eca9c 100644 (file)
--- a/src/frontends/xforms/Color.C
+++ b/src/frontends/xforms/Color.C
@@ -17,6 +17,10 @@
 #include <cmath> // floor
 #include FORMS_H_LOCATION
 
+#ifndef CXX_GLOBAL_CSTD
+using std::floor;
+#endif
+
 using std::max;
 using std::min;
 

diff --git a/src/frontends/xforms/ColorHandler.C b/src/frontends/xforms/ColorHandler.C
index 8cc5b96448577e036e6336784def843fe2f1e24d..1c3be281040614ef6860867801750b5765056bab 100644 (file)
--- a/src/frontends/xforms/ColorHandler.C
+++ b/src/frontends/xforms/ColorHandler.C
@@ -24,6 +24,10 @@
 
 #include <cmath>
 
+#ifndef CXX_GLOBAL_CSTD
+using std::pow;
+#endif
+
 using std::endl;
 
 

diff --git a/src/frontends/xforms/DropDown.C b/src/frontends/xforms/DropDown.C
index 975e5bf2b0982af783e224df2939cf08fea6b0f9..55af9d46bc54006f651deb6b94a36a6b202427b0 100644 (file)
--- a/src/frontends/xforms/DropDown.C
+++ b/src/frontends/xforms/DropDown.C
@@ -19,6 +19,10 @@
 #include <cctype>
 
 
+#ifndef CXX_GLOBAL_CSTD
+using std::isprint;
+#endif
+
 using std::vector;
 
 

diff --git a/src/frontends/xforms/FormBase.h b/src/frontends/xforms/FormBase.h
index 0c962eb811bc04903a20ae6bfaf302de1b272177..a286d298d3c4117d5c09ca074b9243a689de59c7 100644 (file)
--- a/src/frontends/xforms/FormBase.h
+++ b/src/frontends/xforms/FormBase.h
@@ -134,8 +134,8 @@ FormCB<Controller, Base>::FormCB(Controller & c, string const & t,
 template <class Controller, class Base>
 Controller & FormCB<Controller, Base>::controller() const
 {
-       return static_cast<Controller &>(controller_);
-       //return dynamic_cast<Controller &>(controller_);
+       return static_cast<Controller &>(ViewBase::controller_);
+       //return dynamic_cast<Controller &>(ViewBase::controller_);
 }
 
 

diff --git a/src/frontends/xforms/FormThesaurus.C b/src/frontends/xforms/FormThesaurus.C
index 1bc58581a4178e444f500639e799c31ac9b921c1..a45f10c6ff955155cc0a7a2fa03800b5fc6c88a9 100644 (file)
--- a/src/frontends/xforms/FormThesaurus.C
+++ b/src/frontends/xforms/FormThesaurus.C
@@ -21,6 +21,10 @@
 #include "form_thesaurus.h"
 #include "debug.h"
 
+#ifndef CXX_GLOBAL_CSTD
+using std::isupper;
+using std::islower;
+#endif
 
 using std::vector;
 

diff --git a/src/frontends/xforms/XFormsView.C b/src/frontends/xforms/XFormsView.C
index 58a236fece25e011ee8dd2bd1ad79de1fcbb0c02..53733bb873cfe35c99f38235686d6f7e414a0069 100644 (file)
--- a/src/frontends/xforms/XFormsView.C
+++ b/src/frontends/xforms/XFormsView.C
@@ -33,6 +33,7 @@
 
 #include <boost/bind.hpp>
 
+using std::abs;
 using std::endl;
 
 //extern void AutoSave(BufferView *);

diff --git a/src/graphics/ChangeLog b/src/graphics/ChangeLog
index e89606e51b97e0eb48ac8a9699b161573f4211f3..ca43264b1c500dfc26d88aa50115231afb7ddcaf 100644 (file)
--- a/src/graphics/ChangeLog
+++ b/src/graphics/ChangeLog
@@ -1,3 +1,12 @@
+2002-06-07  Angus Leeming  <leeming@lyx.org>
+
+       Fixes needed to compile with Compaq cxx 6.5.
+       * GraphicsConverter.h: forward declare class ConvProcess.
+
+       * GraphicsImageXPM.C: 
+       all c-library variables have been moved into namespace std.
+       Wrap using std::xyz declarations inside a #ifndef CXX_GLOBAL_CSTD block.
+
 2002-06-06  Angus Leeming  <a.leeming@ic.ac.uk>
 
        * GraphicsImageXPM.C (rotate): rotate in the same sense as xdvi!

diff --git a/src/graphics/GraphicsConverter.h b/src/graphics/GraphicsConverter.h
index 4cf51573866813d84270ea19395b8c0c0a1375d4..3acd25998cd0ed9dd7b2e00072134724680a9de4 100644 (file)
--- a/src/graphics/GraphicsConverter.h
+++ b/src/graphics/GraphicsConverter.h
@@ -38,6 +38,8 @@
 
 namespace grfx {
 
+class ConvProcess;
+
 class GConverter : boost::noncopyable {
 public:
 

diff --git a/src/graphics/GraphicsImageXPM.C b/src/graphics/GraphicsImageXPM.C
index 642c81c1de8a550cce0044a166f85bffb584263f..4e2639f683fe769f2bccee358572d9b5e43f8f42 100644 (file)
--- a/src/graphics/GraphicsImageXPM.C
+++ b/src/graphics/GraphicsImageXPM.C
@@ -25,6 +25,14 @@
 #include <cmath>                  // cos, sin
 #include <cstdlib>                // malloc, free
 
+#ifndef CXX_GLOBAL_CSTD
+using std::cos;
+using std::sin;
+using std::malloc;
+using std::strcpy;
+using std::strlen;
+#endif
+
 namespace grfx {
 
 /// Access to this class is through this static method.

diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index 6da3ef3daf1a7843b34bc820b192a31ed4f9e2f5..b35fbbcf5d3642b2de3eb25ca82bd9b1abd5aeae 100644 (file)
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -1,3 +1,10 @@
+2002-06-07  Angus Leeming  <leeming@lyx.org>
+
+       Fixes needed to compile with Compaq cxx 6.5.
+       * insetexternal.C: 
+       all c-library variables have been moved into namespace std.
+       Wrap using std::xyz declarations inside a #ifndef CXX_GLOBAL_CSTD block.
+
 2002-06-05  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
 
        * insetinclude.C (uniqueID): 

diff --git a/src/insets/insetexternal.C b/src/insets/insetexternal.C
index fdfe4a287bfb8e45fad9e0d28f883a6b87fefcb9..c3607d4bba6b6afa49fc505150dcc8feb3e017ec 100644 (file)
--- a/src/insets/insetexternal.C
+++ b/src/insets/insetexternal.C
@@ -36,6 +36,10 @@
 #include <utility>
 
 
+#ifndef CXX_GLOBAL_CSTD
+using std::difftime;
+#endif
+
 using std::ostream;
 using std::endl;
 

diff --git a/src/kbmap.h b/src/kbmap.h
index cfad1f1c4bc6cb35e2dd267d21bae687b3ef56b5..390d63c2057cddc496eca093247479c54a15e987 100644 (file)
--- a/src/kbmap.h
+++ b/src/kbmap.h
@@ -61,9 +61,9 @@ public:
        /// return the ISO value of a keysym
        static char getiso(unsigned int i);
 
-private:
        typedef std::pair<key_modifier::state, key_modifier::state> modifier_pair;
- 
+
+private:
        ///
        struct kb_key {
                /// Keysym

diff --git a/src/lyx_gui.C b/src/lyx_gui.C
index 66bb8fbb253609147c31a1569620de4b3d378c2c..052afa1d55fe45f1d3c4615c65d42e5377d7b0dd 100644 (file)
--- a/src/lyx_gui.C
+++ b/src/lyx_gui.C
@@ -42,6 +42,10 @@
 #include <cstdlib>
 #include <fcntl.h>
 
+#ifndef CXX_GLOBAL_CSTD
+using std::exit;
+#endif
+
 using std::endl;
 
 extern LyXServer * lyxserver;

diff --git a/src/lyx_main.C b/src/lyx_main.C
index 4b3bbe4b9d95793bdf80e58dc572b5eaf8d5333d..f60b69ee8fa6d659fdd0dcaf768b7042bcd4a81a 100644 (file)
--- a/src/lyx_main.C
+++ b/src/lyx_main.C
@@ -51,7 +51,9 @@
 using std::endl;
 
 #ifndef CXX_GLOBAL_CSTD
+using std::exit;
 using std::signal;
+using std::system;
 #endif
 
 extern void LoadLyXFile(string const &);

diff --git a/src/lyxfont.C b/src/lyxfont.C
index 447ce9873112c8f825e9f243bcecf9ef11c8eeec..c3067a84005090f87da6301df3b23f6db384be83 100644 (file)
--- a/src/lyxfont.C
+++ b/src/lyxfont.C
@@ -138,23 +138,18 @@ LyXFont::FontBits LyXFont::ignore = {
        IGNORE };
 
 
-bool LyXFont::FontBits::operator==(LyXFont::FontBits const & fb1) const
-{
-       return fb1.family == family &&
-               fb1.series == series &&
-               fb1.shape == shape &&
-               fb1.size == size &&
-               fb1.color == color &&
-               fb1.emph == emph &&
-               fb1.underbar == underbar &&
-               fb1.noun == noun &&
-               fb1.number == number;
-}
-
-
-bool LyXFont::FontBits::operator!=(LyXFont::FontBits const & fb1) const
-{
-       return !(fb1 == *this);
+bool operator==(LyXFont::FontBits const & lhs,
+               LyXFont::FontBits const & rhs)
+{
+       return lhs.family == rhs.family &&
+               lhs.series == rhs.series &&
+               lhs.shape == rhs.shape &&
+               lhs.size == rhs.size &&
+               lhs.color == rhs.color &&
+               lhs.emph == rhs.emph &&
+               lhs.underbar == rhs.underbar &&
+               lhs.noun == rhs.noun &&
+               lhs.number == rhs.number;
 }
 
 

diff --git a/src/lyxfont.h b/src/lyxfont.h
index ad9d3f276c8dfb814f9348d4124a653a2a0c0a69..3cb1edd795f79042cb6fd6766691007d4c1362de 100644 (file)
--- a/src/lyxfont.h
+++ b/src/lyxfont.h
@@ -326,13 +326,11 @@ public:
 
        /// Converts logical attributes to concrete shape attribute
        LyXFont::FONT_SHAPE realShape() const;
-private:
-       ///
+
+       /** Compaq cxx 6.5 requires that the definition be public so that
+           it can compile operator==()
+        */
        struct FontBits {
-               ///
-               bool operator==(FontBits const & fb1) const;
-               ///
-               bool operator!=(FontBits const & fb1) const;
                ///
                FONT_FAMILY family;
                ///
@@ -352,6 +350,7 @@ private:
                ///
                FONT_MISC_STATE number;
        };
+private:
 
        ///
        FontBits bits;
@@ -435,6 +434,14 @@ bool LyXFont::isSymbolFont() const
 ///
 std::ostream & operator<<(std::ostream &, LyXFont::FONT_MISC_STATE);
 
+bool operator==(LyXFont::FontBits const & lhs, LyXFont::FontBits const & rhs);
+
+inline
+bool operator!=(LyXFont::FontBits const & lhs, LyXFont::FontBits const & rhs)
+{
+       return !(lhs == rhs);
+}
+
 ///
 inline
 bool operator==(LyXFont const & font1, LyXFont const & font2)
@@ -449,4 +456,6 @@ bool operator!=(LyXFont const & font1, LyXFont const & font2)
 {
        return !(font1 == font2);
 }
+
+
 #endif

diff --git a/src/lyxlength.C b/src/lyxlength.C
index 30b54e0b8de639c24c294ab5d6e75e5ecb34ba13..2a0b2fa0b57ad1fbc3629268d7b7403bb599ea03 100644 (file)
--- a/src/lyxlength.C
+++ b/src/lyxlength.C
@@ -24,6 +24,7 @@
 
 #include <cstdlib>
 
+using std::abs;
 
 LyXLength::LyXLength()
        : val_(0), unit_(LyXLength::PT)

diff --git a/src/lyxtextclasslist.C b/src/lyxtextclasslist.C
index ea21f14b0ef57a43ef11bcd0394baa2b624eda51..66b9e162845c33fbda7245b6cc118cbd0cc44c20 100644 (file)
--- a/src/lyxtextclasslist.C
+++ b/src/lyxtextclasslist.C
@@ -29,6 +29,10 @@
 
 #include <utility>
 
+#ifndef CXX_GLOBAL_CSTD
+using std::exit;
+#endif
+
 using lyx::textclass_type;
 using std::pair;
 using std::make_pair;

diff --git a/src/minibuffer.C b/src/minibuffer.C
index 6fbf87ad3b16ec0f278eb16e70a33f67b9523a63..d4017874495a207339473dab098bf67392f06cfe 100644 (file)
--- a/src/minibuffer.C
+++ b/src/minibuffer.C
@@ -37,6 +37,10 @@
 
 #include <cctype>
 
+#ifndef CXX_GLOBAL_CSTD
+using std::isprint;
+#endif
+
 using std::vector;
 using std::back_inserter;
 using std::find;

diff --git a/src/paragraph.h b/src/paragraph.h
index cfe648b4c33aae3e16162b41cb9251daca167f58..3d1193eb5c99a25e46738ec5f0ac67c700f1f06f 100644 (file)
--- a/src/paragraph.h
+++ b/src/paragraph.h
@@ -342,6 +342,10 @@ public:
 private:
        ///
        string layout_;
+public:
+       /** Both these definitions must be made public to keep Compaq cxx 6.5
+        *  happy.
+        */
        ///
        struct InsetTable {
                ///
@@ -354,6 +358,7 @@ private:
 
        ///
        typedef std::vector<InsetTable> InsetList;
+private:
        ///
        InsetList insetlist;
 public:

diff --git a/src/sp_spell.C b/src/sp_spell.C
index a47903f65058f456c2b653bc1a6bfbceba6d720d..9a41e26f9335182f07bbe7dfe3af23d26b60ad18 100644 (file)
--- a/src/sp_spell.C
+++ b/src/sp_spell.C
@@ -53,6 +53,14 @@
 #include "encoding.h"
 #include "sp_ispell.h"
 
+#ifndef CXX_GLOBAL_CSTD
+using std::fdopen;
+using std::strcpy;
+using std::strlen;
+using std::strpbrk;
+using std::strstr;
+#endif
+
 using std::endl;
 
 namespace {

diff --git a/src/support/ChangeLog b/src/support/ChangeLog
index 58fc224a97c510def18e2d5fdfe92433f1969845..319456ff68b2bb0e0d732b8eec0acde42e0e4435 100644 (file)
--- a/src/support/ChangeLog
+++ b/src/support/ChangeLog
@@ -1,3 +1,25 @@
+2002-06-07  Angus Leeming  <leeming@lyx.org>
+
+       Fixes needed to compile with Compaq cxx 6.5.
+       * lyxfunctional.h: rename lyx::class_fun(C & c, void(C::*f)(A)) as
+       lyx::void_class_fun to avoid compiler problems with Compaq cxx 6.5:
+       more than one instance of overloaded function "lyx::class_fun" matches
+       the argument list.
+
+       * filetools.C:
+       * kill.C:
+       * lstrings.C:
+       * putenv.C:
+       * snprintf.h:
+       * systemcall.C:
+       * utility.h:
+       all c-library variables have been moved into namespace std.
+       Wrap using std::xyz declarations inside a #ifndef CXX_GLOBAL_CSTD block.
+
+       * kill.C: rename signal.h as csignal.
+
+       * putenv.C: rename stdlib.h as cstdlib
+
 2002-06-05  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
 
        * lxtl.h: remove unused file

diff --git a/src/support/filetools.C b/src/support/filetools.C
index 2992c5ab5b2599a6f5dac65f8bcef9dba2d0fa0e..0cc8eb112384f4879228882305a20bf5a8a463bf 100644 (file)
--- a/src/support/filetools.C
+++ b/src/support/filetools.C
@@ -16,21 +16,10 @@
 
 #include <config.h>
 
-#include <cctype>
-
-#include <utility>
-#include <fstream>
-
-#include "Lsstream.h"
-
 #ifdef __GNUG__
 #pragma implementation "filetools.h"
 #endif
 
-#include <cstdlib>
-#include <cstdio>
-#include <fcntl.h>
-#include <cerrno>
 #include "debug.h"
 #include "support/lstrings.h"
 #include "support/systemcall.h"
@@ -43,6 +32,18 @@
 #include "lyxlib.h"
 #include "os.h"
 
+#include "Lsstream.h"
+
+#include <cctype>
+#include <cstdlib>
+#include <cstdio>
+#include <fcntl.h>
+#include <cerrno>
+
+#include <utility>
+#include <fstream>
+
+
 // Which part of this is still necessary? (JMarc).
 #if HAVE_DIRENT_H
 # include <dirent.h>
@@ -61,6 +62,14 @@
 # endif
 #endif
 
+#ifndef CXX_GLOBAL_CSTD
+using std::fgetc;
+using std::isalpha;
+using std::isalnum;
+using std::pclose;
+using std::popen;
+#endif
+
 using std::make_pair;
 using std::pair;
 using std::endl;

diff --git a/src/support/kill.C b/src/support/kill.C
index d121843cb4f761846ab1130669720efa3cffd0de..a349891763c06519642ee01dc9ba4571223fc78d 100644 (file)
--- a/src/support/kill.C
+++ b/src/support/kill.C
@@ -1,10 +1,14 @@
 #include <config.h>
 
 #include <sys/types.h>
-#include <signal.h>
+#include <csignal>
 
 #include "lyxlib.h"
 
+#ifndef CXX_GLOBAL_CSTD
+using std::kill;
+#endif
+
 int lyx::kill(int pid, int sig)
 {
        return ::kill(pid, sig);

diff --git a/src/support/lstrings.C b/src/support/lstrings.C
index 7614f5a4bbbc45348d9a9af482d3835a2b64bfe2..bcbfb48917cd80440924ab892170e4ef24fce506 100644 (file)
--- a/src/support/lstrings.C
+++ b/src/support/lstrings.C
@@ -31,9 +31,11 @@ using std::transform;
 using std::vector;
 
 #ifndef CXX_GLOBAL_CSTD
+using std::atof;
+using std::isdigit;
+using std::strlen;
 using std::tolower;
 using std::toupper;
-using std::strlen;
 #endif
 
 

diff --git a/src/support/lyxfunctional.h b/src/support/lyxfunctional.h
index af2107413dfc217c1183a712097acbbdab48af59..2e52337a26a39a59d9f31ef7bfc00105113471b7 100644 (file)
--- a/src/support/lyxfunctional.h
+++ b/src/support/lyxfunctional.h
@@ -60,7 +60,7 @@ class_fun(C & c, R(C::*f)(A))
 
 
 template <class C, class A> void_class_fun_t<C, A>
-class_fun(C & c, void(C::*f)(A))
+void_class_fun(C & c, void(C::*f)(A))
 {
        return void_class_fun_t<C, A>(c, f);
 }

diff --git a/src/support/putenv.C b/src/support/putenv.C
index a54c0dff3bc8e1d1d630eac4894bfd2dd275ffdd..8fe84032b0a03f9e522fd56186d39273e6664d1c 100644 (file)
--- a/src/support/putenv.C
+++ b/src/support/putenv.C
@@ -1,6 +1,10 @@
 #include <config.h>
 
-#include <stdlib.h>
+#include <cstdlib>
+
+#ifndef CXX_GLOBAL_CSTD
+using std::putenv;
+#endif
 
 #include "lyxlib.h"
 int lyx::putenv(char const * str)

diff --git a/src/support/snprintf.h b/src/support/snprintf.h
index aaad68ae4dd4ac5a82ca948a971205a07c17494b..092355169c9cac4c9b625d0fc42beca9f966f341 100644 (file)
--- a/src/support/snprintf.h
+++ b/src/support/snprintf.h
@@ -8,6 +8,11 @@
 extern "C" {
 #endif
 
+#ifndef CXX_GLOBAL_CSTD
+using std::size_t;
+using std::va_list;
+#endif
+
 #if defined(HAVE_DECL_SNPRINTF) || defined(HAVE_DECL_VSNPRINTF)
 #include <stdio.h>
 #endif

diff --git a/src/support/systemcall.C b/src/support/systemcall.C
index 600dbdb0168b693aebc0a9f86fcc2ed76cdd72bd..b7040fcba3037e0328a3aa17fec3f1e003fbee56 100644 (file)
--- a/src/support/systemcall.C
+++ b/src/support/systemcall.C
@@ -20,6 +20,9 @@
 
 #include <cstdlib>
 
+#ifndef CXX_GLOBAL_CSTD
+using std::system;
+#endif
 
 // Reuse of instance
 int Systemcall::startscript(Starttype how, string const & what)

diff --git a/src/support/utility.h b/src/support/utility.h
index 99d94dcc2a45c9c91003a49abe3a9214b91fb1cf..49d8179121ed22c8e4df1bb69cb81fc9cba0d6ac 100644 (file)
--- a/src/support/utility.h
+++ b/src/support/utility.h
@@ -30,6 +30,10 @@
 //#include <cstddef>                 // for size_t
 //#include <utility>                 // for std::pair
 
+#ifndef CXX_GLOBAL_CSTD
+using std::free;
+#endif
+
 namespace lyx
 {
 //  checked_delete() and checked_array_delete()  -----------------------------//
@@ -41,7 +45,7 @@ namespace lyx
     {
        BOOST_STATIC_ASSERT( sizeof(T) != 0 ); // assert type complete at point
                                               // of instantiation
-       free(x);
+       ::free(x);
     }
 
 } // namespace boost

diff --git a/src/tabular-old.C b/src/tabular-old.C
index 1f7d9f576dca4a03eeaafa6a9a2cdb9aecebc49a..796f47b650412b96b13e88aac336cf29d090d764 100644 (file)
--- a/src/tabular-old.C
+++ b/src/tabular-old.C
@@ -19,6 +19,7 @@
 #include "support/lstrings.h"
 #include "support/textutils.h"
 
+using std::abs;
 using std::istream;
 using std::getline;
 using std::endl;

diff --git a/src/tabular.C b/src/tabular.C
index 3ba8ca8bf0065b1d65d2b4a170205a7f25a52d80..f8631459c2e8e841bdccb5b5c24c72fd01d4f2c1 100644 (file)
--- a/src/tabular.C
+++ b/src/tabular.C
@@ -40,6 +40,7 @@
 #include <algorithm>
 #include <cstdlib>
 
+using std::abs;
 using std::ostream;
 using std::istream;
 using std::getline;

diff --git a/src/tabular_funcs.C b/src/tabular_funcs.C
index dd1a2a01c5696dc07158c1b5beb6c860dea684f7..aa6b634dd359ce34d4f4f8371f8fb9fff4ef7e69 100644 (file)
--- a/src/tabular_funcs.C
+++ b/src/tabular_funcs.C
@@ -18,9 +18,12 @@
 
 #include "tabular_funcs.h"
 
-#include "support/lstrings.h"
 #include "support/LIstream.h"
 
+#ifndef CXX_GLOBAL_CSTD
+using std::strlen;
+#endif
+
 using std::istream;
 using std::getline;
 

diff --git a/src/tabular_funcs.h b/src/tabular_funcs.h
index 5db625f4384a0755977eda980cd777b0fa539498..5760d2261d08d388aa7a0ca4ca9d824ade255768 100644 (file)
--- a/src/tabular_funcs.h
+++ b/src/tabular_funcs.h
@@ -20,6 +20,7 @@
 
 #include "LString.h"
 #include "tabular.h"
+#include "support/lstrings.h" // for tostr
 
 #include <iosfwd>
 

diff --git a/src/vc-backend.C b/src/vc-backend.C
index 1b19afde233d94c5139d4d0d408e6cc8d9070375..671afdd36ce28df069c27aa8270ee5480802449f 100644 (file)
--- a/src/vc-backend.C
+++ b/src/vc-backend.C
@@ -21,6 +21,11 @@
 
 #include <fstream>
 
+#ifndef CXX_GLOBAL_CSTD
+using std::asctime;
+using std::gmtime;
+#endif
+
 using std::endl;
 using std::ifstream;
 using std::getline;