fix compilation with gcc 3.4

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_3_X@8713 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2004-04-29 15:57:12 +00:00
parent 2de596b2e0
commit dcabae77af
14 changed files with 56 additions and 25 deletions

View File

@ -1,3 +1,8 @@
2004-04-29 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* boost/format/format_implementation.hpp:
* boost/config/compiler/gcc.hpp: fix compilation with gcc 3.4
2004-03-26 Angus Leeming <leeming@lyx.org>
* libs/regex/Makefile.am: silence automake 1.7 warning by

View File

@ -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

View File

@ -151,7 +151,7 @@ basic_format<Ch,Tr>& basic_format<Ch,Tr> ::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;
}

View File

@ -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

View File

@ -1,3 +1,7 @@
2004-04-23 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* CREDITS: update Hartmut Haase's entry
2004-03-17 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* configure.m4: check for acrobat, acrord32 and gsview32 as PDF

View File

@ -15,7 +15,7 @@ namespace boost
{
extern
template basic_format<char>;
template class basic_format<char>;
extern template
std::ostream &

View File

@ -1,3 +1,7 @@
2004-04-29 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* BoostFormat.h: fix compilation with gcc 3.4
2003-09-24 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* paragraph.C (TeXEnvironment): make sure that there is a line

View File

@ -1,3 +1,7 @@
2004-04-29 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* ControlDialog.tmpl (show, update, hide): gcc 3.4 compilation fix
2003-02-10 Jean-Marc Lasgouttes <lasgouttes@freesurf.fr>
* ControlInclude.C (Browse): replace masterFilename_ with

View File

@ -27,54 +27,54 @@ ControlDialog<Base>::ControlDialog(LyXView & lv, Dialogs & d)
template <class Base>
void ControlDialog<Base>::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 <class Base>
void ControlDialog<Base>::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 <class Base>
void ControlDialog<Base>::hide()
{
emergency_exit_ = false;
this->emergency_exit_ = false;
clearParams();
disconnect();
view().hide();
this->disconnect();
this->view().hide();
}

View File

@ -1,3 +1,7 @@
2004-04-29 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* Qt2Base.h (controller): gcc 3.4 compilation fix
2004-01-22 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* QLPopupMenu.C (getLabel): fix bug #1350. The menu entry did not

View File

@ -174,14 +174,14 @@ Qt2CB<Controller, Base>::Qt2CB(QString const & t)
template <class Controller, class Base>
Controller & Qt2CB<Controller, Base>::controller()
{
return static_cast<Controller &>(getController());
return static_cast<Controller &>(this->getController());
}
template <class Controller, class Base>
Controller const & Qt2CB<Controller, Base>::controller() const
{
return static_cast<Controller const &>(getController());
return static_cast<Controller const &>(this->getController());
}

View File

@ -1,3 +1,7 @@
2004-04-29 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* FormBase.h (controller): gcc 3.4 compilation fix
2003-12-29 Angus Leeming <leeming@lyx.org>
* xforms_helpers.C (read, write): output a diagnostic message if

View File

@ -188,14 +188,14 @@ FormCB<Controller, Base>::FormCB(string const & t, bool allowResize)
template <class Controller, class Base>
Controller & FormCB<Controller, Base>::controller()
{
return static_cast<Controller &>(getController());
return static_cast<Controller &>(this->getController());
}
template <class Controller, class Base>
Controller const & FormCB<Controller, Base>::controller() const
{
return static_cast<Controller const &>(getController());
return static_cast<Controller const &>(this->getController());
}

View File

@ -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