anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-05 13:26:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

make lyx compile with gcc 3.4. remove some warnings.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7314 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Lars Gullik Bjønnes 2003-07-18 08:46:00 +00:00
parent 54b1bb8637
commit 01b31c56c9
21 changed files with 109 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
boost/ChangeLog
View File

@ -1,3 +1,13 @@
2003-07-18 Lars Gullik Bjønnes <larsbj@gullik.net>
* 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 <larsbj@gullik.net>
* boost/type_traits/detail/wrap.hpp: add file

2
boost/boost/config/compiler/gcc.hpp
View File

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

13
boost/libs/regex/src/c_regex_traits.cpp
View File

@ -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<wchar_t>::strwiden(wchar_t *s1, std:
#endif // BOOST_NO_WREGEX
} // namespace boost

12
boost/libs/regex/src/cpp_regex_traits.cpp
View File

@ -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<char>::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<char>::syntax_char, 256);
unsigned i;
@ -241,7 +241,7 @@ message_data<char>::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<wchar_t>::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<wchar_t>::strwiden(wchar_t *s1, st
} // namespace boost
#endif

4
config/ChangeLog
View File

@ -1,3 +1,7 @@
2003-07-18 Lars Gullik Bjønnes <larsbj@gullik.net>
* lyxinclude.m4: add gcc 3.4
2003-07-15 Angus Leeming <leeming@lyx.org>
* lyxinclude.m4: Do not pass the -Winline option to gcc.

1
config/lyxinclude.m4
View File

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

9
src/frontends/controllers/ChangeLog
View File

@ -1,3 +1,12 @@
2003-07-18 Lars Gullik Bjønnes <larsbj@gullik.net>
* 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 <leeming@lyx.org>
* ControlChanges.h:

26
src/frontends/controllers/ControlDialog.tmpl
View File

@ -27,13 +27,13 @@ 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;
}
@ -43,17 +43,18 @@ void ControlDialog<Base>::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 <class Base>
void ControlDialog<Base>::update()
{
if (isBufferDependent() && !bufferIsAvailable())
if (this->isBufferDependent() && !this->bufferIsAvailable())
return;
setParams();
@ -62,19 +63,20 @@ void ControlDialog<Base>::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 <class Base>
void ControlDialog<Base>::hide()
{
this->emergency_exit_ = false;
clearParams();
disconnect();
view().hide();
this->disconnect();
this->view().hide();
}

6
src/frontends/controllers/ControlGraphics.C
View File

@ -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));
}

6
src/frontends/qt2/ChangeLog
View File

@ -1,3 +1,9 @@
2003-07-18 Lars Gullik Bjønnes <larsbj@gullik.net>
* Qt2Base.h (controller): ditto
* QDialogView.h (controller): follow C++ rules more closely.
2003-07-15 Juergen Spitzmueller <j.spitzmueller@gmx.de>
* QTabular.C:

4
src/frontends/qt2/QDialogView.h
View File

@ -167,14 +167,14 @@ QController<Controller, Base>::QController(Dialog & p, string const & t)
template <class Controller, class Base>
Controller & QController<Controller, Base>::controller()
{
return static_cast<Controller &>(getController());
return static_cast<Controller &>(this->getController());
}
template <class Controller, class Base>
Controller const & QController<Controller, Base>::controller() const
{
return static_cast<Controller const &>(getController());
return static_cast<Controller const &>(this->getController());
}

4
src/frontends/qt2/Qt2Base.h
View File

@ -168,14 +168,14 @@ Qt2CB<Controller, Base>::Qt2CB(string 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());
}

6
src/frontends/xforms/ChangeLog
View File

@ -1,3 +1,9 @@
2003-07-18 Lars Gullik Bjønnes <larsbj@gullik.net>
* FormDialogView.h (controller): ditto
* FormBase.h (controller): follow C++ rules more closely.
2003-07-16 Angus Leeming <angus@localhost.localdomain>
* FormDialogView.C (postMessage): remove preprocessor warning.

4
src/frontends/xforms/FormBase.h
View File

@ -183,14 +183,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());
}

4
src/frontends/xforms/FormDialogView.h
View File

@ -182,14 +182,14 @@ FormController<Controller, Base>::FormController(Dialog & p,
template <class Controller, class Base>
Controller & FormController<Controller, Base>::controller()
{
return static_cast<Controller &>(getController());
return static_cast<Controller &>(this->getController());
}
template <class Controller, class Base>
Controller const & FormController<Controller, Base>::controller() const
{
return static_cast<Controller const &>(getController());
return static_cast<Controller const &>(this->getController());
}

5
src/mathed/ChangeLog
View File

@ -1,3 +1,8 @@
2003-07-18 Lars Gullik Bjønnes <larsbj@gullik.net>
* math_parser.C (catInit): dont use unprintable control chars in
source.
2003-07-17 Angus Leeming <leeming@lyx.org>
* formulabase.C (localDispatch): return UNDISPATCHED for all

2
src/mathed/math_parser.C
View File

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

3
src/support/BoostFormat.h
View File

@ -24,9 +24,6 @@
namespace boost
{
extern
template basic_format<char>;
extern template
std::ostream &
operator<< <char, std::char_traits<char> >(std::ostream &,

5
src/support/ChangeLog
View File

@ -1,3 +1,8 @@
2003-07-18 Lars Gullik Bjønnes <larsbj@gullik.net>
* 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 <larsbj@gullik.net>
* os_win32.C: put namespace os in lyx::support.

11
src/tex2lyx/ChangeLog
View File

@ -1,9 +1,15 @@
2003-07-18 Lars Gullik Bjønnes <larsbj@gullik.net>
* 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 <assirati@fma.if.usp.br>
* texparser.C: fix paragraph parsing after comment
2003-04-29 André Pönitz <poenitz@gmx.net>
* Makefile.am:
texparser.h: whitespace
@ -13,7 +19,7 @@
versions of gcc to compile the code.
2003-04-17 André Pönitz <poenitz@gmx.net>
* math.C:
preamble.C:
table.C:
@ -50,4 +56,3 @@
* Makefile.am: empty, dummy file so that autogen.sh and configure
are happy.

37
src/tex2lyx/texparser.C
View File

@ -1,4 +1,3 @@
#include <config.h>
#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];
}