diff --git a/boost/ChangeLog b/boost/ChangeLog index 10a6927c0e..7c47ac228f 100644 --- a/boost/ChangeLog +++ b/boost/ChangeLog @@ -1,3 +1,8 @@ +2004-04-29 Jean-Marc Lasgouttes + + * boost/format/format_implementation.hpp: + * boost/config/compiler/gcc.hpp: fix compilation with gcc 3.4 + 2004-03-26 Angus Leeming * libs/regex/Makefile.am: silence automake 1.7 warning by diff --git a/boost/boost/config/compiler/gcc.hpp b/boost/boost/config/compiler/gcc.hpp index 93e4e94e6b..aed95465c9 100644 --- a/boost/boost/config/compiler/gcc.hpp +++ b/boost/boost/config/compiler/gcc.hpp @@ -49,8 +49,8 @@ # error "Compiler not configured - please reconfigure" #endif // -// last known and checked version is 3.2: -#if (__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ > 3)) +// last known and checked version is 3.4: +#if (__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ > 4)) # if defined(BOOST_ASSERT_CONFIG) # error "Unknown compiler version - please run the configure tests and report the results" # else diff --git a/boost/boost/format/format_implementation.hpp b/boost/boost/format/format_implementation.hpp index 611e095977..eab25bf55a 100644 --- a/boost/boost/format/format_implementation.hpp +++ b/boost/boost/format/format_implementation.hpp @@ -151,7 +151,7 @@ basic_format& basic_format ::clear_bind(int argN) { if(argN<1 || argN > num_args_ || bound_.size()==0 || !bound_[argN-1] ) { - if( exceptions() & out_of_range_bit ) + if( exceptions() & io::out_of_range_bit ) boost::throw_exception(io::out_of_range()); // arg not in range. else return *this; } diff --git a/lib/CREDITS b/lib/CREDITS index b46f3aef61..8a10718b9b 100644 --- a/lib/CREDITS +++ b/lib/CREDITS @@ -78,7 +78,7 @@ IE-mail: ron@18james.com @bHartmut Goebel @iE-mail: goebel@noris.net Improvements to Koma-Script classes -@bHartmut Haase +@bHartmut Haase (HHa) @iE-mail: hha4491@atomstromfrei.de German translation of the documentation @bHelge Hafting diff --git a/lib/ChangeLog b/lib/ChangeLog index a895c70551..b34f5337a4 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,7 @@ +2004-04-23 Jean-Marc Lasgouttes + + * CREDITS: update Hartmut Haase's entry + 2004-03-17 Jean-Marc Lasgouttes * configure.m4: check for acrobat, acrord32 and gsview32 as PDF diff --git a/src/BoostFormat.h b/src/BoostFormat.h index e96cb1d246..8d5d205a1a 100644 --- a/src/BoostFormat.h +++ b/src/BoostFormat.h @@ -15,7 +15,7 @@ namespace boost { extern -template basic_format; +template class basic_format; extern template std::ostream & diff --git a/src/ChangeLog b/src/ChangeLog index 3f84a2d376..b0ae99c1dd 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2004-04-29 Jean-Marc Lasgouttes + + * BoostFormat.h: fix compilation with gcc 3.4 + 2003-09-24 Jean-Marc Lasgouttes * paragraph.C (TeXEnvironment): make sure that there is a line diff --git a/src/frontends/controllers/ChangeLog b/src/frontends/controllers/ChangeLog index 99f44ddabb..cb45300937 100644 --- a/src/frontends/controllers/ChangeLog +++ b/src/frontends/controllers/ChangeLog @@ -1,3 +1,7 @@ +2004-04-29 Jean-Marc Lasgouttes + + * ControlDialog.tmpl (show, update, hide): gcc 3.4 compilation fix + 2003-02-10 Jean-Marc Lasgouttes * ControlInclude.C (Browse): replace masterFilename_ with diff --git a/src/frontends/controllers/ControlDialog.tmpl b/src/frontends/controllers/ControlDialog.tmpl index abcd863bbc..6773817003 100644 --- a/src/frontends/controllers/ControlDialog.tmpl +++ b/src/frontends/controllers/ControlDialog.tmpl @@ -27,54 +27,54 @@ ControlDialog::ControlDialog(LyXView & lv, Dialogs & d) template void ControlDialog::show() { - if (isBufferDependent() && !bufferIsAvailable()) + if (this->isBufferDependent() && !this->bufferIsAvailable()) return; - connect(); + this->connect(); if (!dialog_built_) { - view().build(); + this->view().build(); dialog_built_ = true; } setParams(); - if (emergency_exit_) { + if (this->emergency_exit_) { hide(); return; } - bc().readOnly(bufferIsReadonly()); - view().show(); + this->bc().readOnly(this->bufferIsReadonly()); + this->view().show(); // The widgets may not be valid, so refresh the button controller - bc().refresh(); + this->bc().refresh(); } template void ControlDialog::update() { - if (isBufferDependent() && !bufferIsAvailable()) + if (this->isBufferDependent() && !this->bufferIsAvailable()) return; setParams(); - if (emergency_exit_) { + if (this->emergency_exit_) { hide(); return; } - bc().readOnly(bufferIsReadonly()); - view().update(); + this->bc().readOnly(this->bufferIsReadonly()); + this->view().update(); // The widgets may not be valid, so refresh the button controller - bc().refresh(); + this->bc().refresh(); } template void ControlDialog::hide() { - emergency_exit_ = false; + this->emergency_exit_ = false; clearParams(); - disconnect(); - view().hide(); + this->disconnect(); + this->view().hide(); } diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog index ace529ae4f..bfb3d6eb17 100644 --- a/src/frontends/qt2/ChangeLog +++ b/src/frontends/qt2/ChangeLog @@ -1,3 +1,7 @@ +2004-04-29 Jean-Marc Lasgouttes + + * Qt2Base.h (controller): gcc 3.4 compilation fix + 2004-01-22 Jean-Marc Lasgouttes * QLPopupMenu.C (getLabel): fix bug #1350. The menu entry did not diff --git a/src/frontends/qt2/Qt2Base.h b/src/frontends/qt2/Qt2Base.h index 0db44a8692..62ef5d195f 100644 --- a/src/frontends/qt2/Qt2Base.h +++ b/src/frontends/qt2/Qt2Base.h @@ -174,14 +174,14 @@ Qt2CB::Qt2CB(QString const & t) template Controller & Qt2CB::controller() { - return static_cast(getController()); + return static_cast(this->getController()); } template Controller const & Qt2CB::controller() const { - return static_cast(getController()); + return static_cast(this->getController()); } diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog index d97a93aeb0..9f9648a0c2 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -1,3 +1,7 @@ +2004-04-29 Jean-Marc Lasgouttes + + * FormBase.h (controller): gcc 3.4 compilation fix + 2003-12-29 Angus Leeming * xforms_helpers.C (read, write): output a diagnostic message if diff --git a/src/frontends/xforms/FormBase.h b/src/frontends/xforms/FormBase.h index c5e982ea0e..6e1c537c2f 100644 --- a/src/frontends/xforms/FormBase.h +++ b/src/frontends/xforms/FormBase.h @@ -188,14 +188,14 @@ FormCB::FormCB(string const & t, bool allowResize) template Controller & FormCB::controller() { - return static_cast(getController()); + return static_cast(this->getController()); } template Controller const & FormCB::controller() const { - return static_cast(getController()); + return static_cast(this->getController()); } diff --git a/status.13x b/status.13x index 1537de34a2..93c24fa146 100644 --- a/status.13x +++ b/status.13x @@ -19,6 +19,8 @@ What's new ** Updates +- new textclass svglobal, needed for various Springer Verlag journals + for which no specific class exists - updated basque, danish, italian and romanian localizations; updated basque and german documentations @@ -40,8 +42,10 @@ What's new - fix running makeindex and bibtex when the file name contains some special characters [bug #1526] -- Prevent clashes with LaTeX packages defining "\boldsymbol". +- Prevent clashes with LaTeX packages defining "\boldsymbol" +- fix handling of floats and counters in svjog and svprobth + textclasses [bug #1430] * User Interface: @@ -70,6 +74,8 @@ What's new - fix compilation with SGI C++ compiler +- fix compilation with gcc 3.4 + - fix linking with Qt/Mac 3.3.1 - fix warning with automake 1.7