From: Lars Gullik Bjønnes Date: Fri, 18 Jul 2003 08:46:00 +0000 (+0000) Subject: make lyx compile with gcc 3.4. remove some warnings. X-Git-Tag: 1.6.10~16510 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=01b31c56c9ce03bea93466c3fd6519366e864e0e;p=features.git make lyx compile with gcc 3.4. remove some warnings. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7314 a592a061-630c-0410-9148-cb99ea01b6c8 --- diff --git a/boost/ChangeLog b/boost/ChangeLog index 1ff319a637..dfe2e52813 100644 --- a/boost/ChangeLog +++ b/boost/ChangeLog @@ -1,3 +1,13 @@ +2003-07-18 Lars Gullik Bjønnes + + * libs/regex/src/cpp_regex_traits.cpp (message_data): cast to safe + types + + * libs/regex/src/c_regex_traits.cpp (do_update_ctype): cast to + safe types. + + * boost/config/compiler/gcc.hpp: allow for gcc 2.4 + 2003-05-01 Lars Gullik Bjønnes * boost/type_traits/detail/wrap.hpp: add file diff --git a/boost/boost/config/compiler/gcc.hpp b/boost/boost/config/compiler/gcc.hpp index 168ee9c548..3b5c5d02fc 100644 --- a/boost/boost/config/compiler/gcc.hpp +++ b/boost/boost/config/compiler/gcc.hpp @@ -59,7 +59,7 @@ #endif // // last known and checked version is 3.2: -#if (__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ > 3)) +#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/libs/regex/src/c_regex_traits.cpp b/boost/libs/regex/src/c_regex_traits.cpp index 1b1bcdd9e5..1ca5f8b52a 100644 --- a/boost/libs/regex/src/c_regex_traits.cpp +++ b/boost/libs/regex/src/c_regex_traits.cpp @@ -8,11 +8,11 @@ * provided that the above copyright notice appear in all copies and * that both that copyright notice and this permission notice appear * in supporting documentation. Dr John Maddock makes no representations - * about the suitability of this software for any purpose. + * about the suitability of this software for any purpose. * It is provided "as is" without express or implied warranty. * */ - + /* * LOCATION: see http://www.boost.org for most recent version. * FILE c_regex_traits.cpp @@ -514,9 +514,9 @@ void BOOST_REGEX_CALL c_traits_base::do_update_ctype() if(std::isxdigit(i)) class_map[i] |= char_class_xdigit; } - class_map['_'] |= char_class_underscore; - class_map[' '] |= char_class_blank; - class_map['\t'] |= char_class_blank; + class_map[(unsigned char)('_')] |= char_class_underscore; + class_map[(unsigned char)(' ')] |= char_class_blank; + class_map[(unsigned char)('\t')] |= char_class_blank; for(i = 0; i < map_size; ++i) { lower_case_map[i] = (char)std::tolower(i); @@ -1068,6 +1068,3 @@ std::size_t BOOST_REGEX_CALL c_regex_traits::strwiden(wchar_t *s1, std: #endif // BOOST_NO_WREGEX } // namespace boost - - - diff --git a/boost/libs/regex/src/cpp_regex_traits.cpp b/boost/libs/regex/src/cpp_regex_traits.cpp index 0c89ad2446..a8f7c823a2 100644 --- a/boost/libs/regex/src/cpp_regex_traits.cpp +++ b/boost/libs/regex/src/cpp_regex_traits.cpp @@ -8,11 +8,11 @@ * provided that the above copyright notice appear in all copies and * that both that copyright notice and this permission notice appear * in supporting documentation. Dr John Maddock makes no representations - * about the suitability of this software for any purpose. + * about the suitability of this software for any purpose. * It is provided "as is" without express or implied warranty. * */ - + /* * LOCATION: see http://www.boost.org for most recent version. * FILE: c_regex_traits.cpp @@ -218,7 +218,7 @@ message_data::message_data(const std::locale& l, const std::string& regex_ #else BOOST_REGEX_NOEH_ASSERT(cat >= 0); #endif - } + } #endif std::memset(syntax_map, cpp_regex_traits::syntax_char, 256); unsigned i; @@ -241,7 +241,7 @@ message_data::message_data(const std::locale& l, const std::string& regex_ #endif for(std::size_t j = 0; j < s.size(); ++j) { - syntax_map[s[j]] = (unsigned char)(i); + syntax_map[(unsigned char)s[j]] = (unsigned char)(i); } } @@ -691,7 +691,7 @@ message_data::message_data(const std::locale& l, const std::string& reg if((int)cat >= 0) msgs.close(cat); -#endif +#endif } } // namespace re_detail @@ -876,5 +876,3 @@ std::size_t BOOST_REGEX_CALL cpp_regex_traits::strwiden(wchar_t *s1, st } // namespace boost #endif - - diff --git a/config/ChangeLog b/config/ChangeLog index 9e902e038f..8b23923fc2 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,7 @@ +2003-07-18 Lars Gullik Bjønnes + + * lyxinclude.m4: add gcc 3.4 + 2003-07-15 Angus Leeming * lyxinclude.m4: Do not pass the -Winline option to gcc. diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4 index 396a701e93..f37f8f9c6b 100644 --- a/config/lyxinclude.m4 +++ b/config/lyxinclude.m4 @@ -211,6 +211,7 @@ if test x$GXX = xyes; then 3.1*) CXXFLAGS="$lyx_opt -finline-limit=500 -fno-exceptions";; 3.2*) CXXFLAGS="$lyx_opt -fno-exceptions";; 3.3*) CXXFLAGS="$lyx_opt -fno-exceptions";; + 3.4*) CXXFLAGS="$lyx_opt -fno-exceptions";; *) CXXFLAGS="$lyx_opt";; esac if test x$enable_debug = xyes ; then diff --git a/src/frontends/controllers/ChangeLog b/src/frontends/controllers/ChangeLog index b216c4de47..e780b818e0 100644 --- a/src/frontends/controllers/ChangeLog +++ b/src/frontends/controllers/ChangeLog @@ -1,3 +1,12 @@ +2003-07-18 Lars Gullik Bjønnes + + * ControlGraphics.C (dispatchParams): avoid some variable/function + shadowing. + + * ControlDialog.tmpl (show): follow C++ rules more closely + (update): ditto + (hide): ditto + 2003-07-17 Angus Leeming * ControlChanges.h: diff --git a/src/frontends/controllers/ControlDialog.tmpl b/src/frontends/controllers/ControlDialog.tmpl index 7135ac56f2..ac9de2c99e 100644 --- a/src/frontends/controllers/ControlDialog.tmpl +++ b/src/frontends/controllers/ControlDialog.tmpl @@ -27,13 +27,13 @@ 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; } @@ -43,17 +43,18 @@ void ControlDialog::show() 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(); @@ -62,19 +63,20 @@ void ControlDialog::update() 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() { this->emergency_exit_ = false; clearParams(); - disconnect(); - view().hide(); + this->disconnect(); + this->view().hide(); } diff --git a/src/frontends/controllers/ControlGraphics.C b/src/frontends/controllers/ControlGraphics.C index cd342c1ea6..5671870de0 100644 --- a/src/frontends/controllers/ControlGraphics.C +++ b/src/frontends/controllers/ControlGraphics.C @@ -68,11 +68,11 @@ void ControlGraphics::clearParams() void ControlGraphics::dispatchParams() { - InsetGraphicsParams params(params()); + InsetGraphicsParams tmp_params(params()); // core requires absolute path during runtime - params.filename = MakeAbsPath(params.filename, + tmp_params.filename = MakeAbsPath(tmp_params.filename, kernel().buffer()->filePath()); - string const lfun = InsetGraphicsMailer::params2string(params); + string const lfun = InsetGraphicsMailer::params2string(tmp_params); kernel().dispatch(FuncRequest(LFUN_INSET_APPLY, lfun)); } diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog index 72c02a0058..0699d1f47a 100644 --- a/src/frontends/qt2/ChangeLog +++ b/src/frontends/qt2/ChangeLog @@ -1,3 +1,9 @@ +2003-07-18 Lars Gullik Bjønnes + + * Qt2Base.h (controller): ditto + + * QDialogView.h (controller): follow C++ rules more closely. + 2003-07-15 Juergen Spitzmueller * QTabular.C: diff --git a/src/frontends/qt2/QDialogView.h b/src/frontends/qt2/QDialogView.h index cf59c8fac5..8e79cd23a3 100644 --- a/src/frontends/qt2/QDialogView.h +++ b/src/frontends/qt2/QDialogView.h @@ -167,14 +167,14 @@ QController::QController(Dialog & p, string const & t) template Controller & QController::controller() { - return static_cast(getController()); + return static_cast(this->getController()); } template Controller const & QController::controller() const { - return static_cast(getController()); + return static_cast(this->getController()); } diff --git a/src/frontends/qt2/Qt2Base.h b/src/frontends/qt2/Qt2Base.h index 027911319f..6131f13504 100644 --- a/src/frontends/qt2/Qt2Base.h +++ b/src/frontends/qt2/Qt2Base.h @@ -168,14 +168,14 @@ Qt2CB::Qt2CB(string 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 3470af1fc5..4cf7a60a03 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -1,3 +1,9 @@ +2003-07-18 Lars Gullik Bjønnes + + * FormDialogView.h (controller): ditto + + * FormBase.h (controller): follow C++ rules more closely. + 2003-07-16 Angus Leeming * FormDialogView.C (postMessage): remove preprocessor warning. diff --git a/src/frontends/xforms/FormBase.h b/src/frontends/xforms/FormBase.h index bb0d481cad..6e4de184a0 100644 --- a/src/frontends/xforms/FormBase.h +++ b/src/frontends/xforms/FormBase.h @@ -183,14 +183,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/src/frontends/xforms/FormDialogView.h b/src/frontends/xforms/FormDialogView.h index 30383241c4..454c7ccb0e 100644 --- a/src/frontends/xforms/FormDialogView.h +++ b/src/frontends/xforms/FormDialogView.h @@ -182,14 +182,14 @@ FormController::FormController(Dialog & p, template Controller & FormController::controller() { - return static_cast(getController()); + return static_cast(this->getController()); } template Controller const & FormController::controller() const { - return static_cast(getController()); + return static_cast(this->getController()); } diff --git a/src/mathed/ChangeLog b/src/mathed/ChangeLog index bdad015eda..546961bc12 100644 --- a/src/mathed/ChangeLog +++ b/src/mathed/ChangeLog @@ -1,3 +1,8 @@ +2003-07-18 Lars Gullik Bjønnes + + * math_parser.C (catInit): dont use unprintable control chars in + source. + 2003-07-17 Angus Leeming * formulabase.C (localDispatch): return UNDISPATCHED for all diff --git a/src/mathed/math_parser.C b/src/mathed/math_parser.C index 9ef17d6d32..219db10b65 100644 --- a/src/mathed/math_parser.C +++ b/src/mathed/math_parser.C @@ -160,7 +160,7 @@ void catInit() theCatcode[int('#')] = catParameter; theCatcode[int('^')] = catSuper; theCatcode[int('_')] = catSub; - theCatcode[int('')] = catIgnore; + theCatcode[int(0x7f)] = catIgnore; theCatcode[int(' ')] = catSpace; theCatcode[int('\t')] = catSpace; theCatcode[int('\r')] = catNewline; diff --git a/src/support/BoostFormat.h b/src/support/BoostFormat.h index 3be9a8afc1..1ef9b82bbd 100644 --- a/src/support/BoostFormat.h +++ b/src/support/BoostFormat.h @@ -24,9 +24,6 @@ namespace boost { -extern -template basic_format; - extern template std::ostream & operator<< >(std::ostream &, diff --git a/src/support/ChangeLog b/src/support/ChangeLog index cf642607a3..51e71ee2d2 100644 --- a/src/support/ChangeLog +++ b/src/support/ChangeLog @@ -1,3 +1,8 @@ +2003-07-18 Lars Gullik Bjønnes + + * BoostFormat.h (boost): remove one extern template. Gcc 3.4. does + not allow it (at least not in this form.) + 2003-07-01 Lars Gullik Bjønnes * os_win32.C: put namespace os in lyx::support. diff --git a/src/tex2lyx/ChangeLog b/src/tex2lyx/ChangeLog index 40de758608..c3579c5c34 100644 --- a/src/tex2lyx/ChangeLog +++ b/src/tex2lyx/ChangeLog @@ -1,9 +1,15 @@ +2003-07-18 Lars Gullik Bjønnes + + * texparser.C (catInit): same warning avoidance as in math_parser.C + (setCatCode): cast to safe type + (getCatCode): ditto + 2003-05-17 Joao Luis M. Assirati * texparser.C: fix paragraph parsing after comment 2003-04-29 André Pönitz - + * Makefile.am: texparser.h: whitespace @@ -13,7 +19,7 @@ versions of gcc to compile the code. 2003-04-17 André Pönitz - + * math.C: preamble.C: table.C: @@ -50,4 +56,3 @@ * Makefile.am: empty, dummy file so that autogen.sh and configure are happy. - diff --git a/src/tex2lyx/texparser.C b/src/tex2lyx/texparser.C index 0e4f79df70..35e7c99fa4 100644 --- a/src/tex2lyx/texparser.C +++ b/src/tex2lyx/texparser.C @@ -1,4 +1,3 @@ - #include #include "texparser.h" @@ -38,30 +37,30 @@ void catInit() fill(theCatcode + 'a', theCatcode + 'z' + 1, catLetter); fill(theCatcode + 'A', theCatcode + 'Z' + 1, catLetter); - theCatcode['\\'] = catEscape; - theCatcode['{'] = catBegin; - theCatcode['}'] = catEnd; - theCatcode['$'] = catMath; - theCatcode['&'] = catAlign; + theCatcode[int('\\')] = catEscape; + theCatcode[int('{')] = catBegin; + theCatcode[int('}')] = catEnd; + theCatcode[int('$')] = catMath; + theCatcode[int('&')] = catAlign; theCatcode[10] = catNewline; - theCatcode['#'] = catParameter; - theCatcode['^'] = catSuper; - theCatcode['_'] = catSub; - theCatcode[''] = catIgnore; - theCatcode[' '] = catSpace; - theCatcode['\t'] = catSpace; + theCatcode[int('#')] = catParameter; + theCatcode[int('^')] = catSuper; + theCatcode[int('_')] = catSub; + theCatcode[0x7f] = catIgnore; + theCatcode[int(' ')] = catSpace; + theCatcode[int('\t')] = catSpace; theCatcode[13] = catIgnore; - theCatcode['~'] = catActive; - theCatcode['%'] = catComment; + theCatcode[int('~')] = catActive; + theCatcode[int('%')] = catComment; // This is wrong! - theCatcode['@'] = catLetter; + theCatcode[int('@')] = catLetter; } } -// +// // catcodes // @@ -171,7 +170,7 @@ void Parser::skip_spaces() while (1) { if (next_token().cat() == catSpace || next_token().cat() == catNewline) get_token(); - else if (next_token().cat() == catComment) + else if (next_token().cat() == catComment) while (next_token().cat() != catNewline) get_token(); else @@ -368,11 +367,11 @@ string Parser::verbatim_item() void Parser::setCatCode(char c, CatCode cat) { - theCatcode[c] = cat; + theCatcode[(unsigned char)c] = cat; } CatCode Parser::getCatCode(char c) const { - return theCatcode[c]; + return theCatcode[(unsigned char)c]; }