Please have a quick look.
? src/frontends/xforms/lyx_forms.h
? src/frontends/xforms/lyx_xpm.h
Index: boost/boost/config/compiler/gcc.hpp
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/boost/boost/config/compiler/gcc.hpp,v
retrieving revision 1.3
diff -u -p -r1.3 gcc.hpp
--- boost/boost/config/compiler/gcc.hpp 17 Jun 2003 21:27:35 -0000 1.3
+++ boost/boost/config/compiler/gcc.hpp 18 Jul 2003 01:09:32 -0000
@@ -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
Index: boost/libs/regex/src/c_regex_traits.cpp
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/boost/libs/regex/src/c_regex_traits.cpp,v
retrieving revision 1.3
diff -u -p -r1.3 c_regex_traits.cpp
--- boost/libs/regex/src/c_regex_traits.cpp 3 Mar 2003 15:53:47 -0000 1.3
+++ boost/libs/regex/src/c_regex_traits.cpp 18 Jul 2003 01:09:32 -0000
@@ -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_
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_tra
#endif // BOOST_NO_WREGEX
} // namespace boost
-
-
-
Index: boost/libs/regex/src/cpp_regex_traits.cpp
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/boost/libs/regex/src/cpp_regex_traits.cpp,v
retrieving revision 1.6
diff -u -p -r1.6 cpp_regex_traits.cpp
--- boost/libs/regex/src/cpp_regex_traits.cpp 15 Oct 2002 17:51:41 -0000 1.6
+++ boost/libs/regex/src/cpp_regex_traits.cpp 18 Jul 2003 01:09:32 -0000
@@ -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 s
#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 s
#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(cons
if((int)cat >= 0)
msgs.close(cat);
-#endif
+#endif
}
} // namespace re_detail
@@ -876,5 +876,3 @@ std::size_t BOOST_REGEX_CALL cpp_regex_t
} // namespace boost
#endif
-
-
Index: config/lyxinclude.m4
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/config/lyxinclude.m4,v
retrieving revision 1.85
diff -u -p -r1.85 lyxinclude.m4
--- config/lyxinclude.m4 16 Jul 2003 20:44:24 -0000 1.85
+++ config/lyxinclude.m4 18 Jul 2003 01:09:32 -0000
@@ -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
Index: src/frontends/controllers/ControlDialog.tmpl
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/controllers/ControlDialog.tmpl,v
retrieving revision 1.13
diff -u -p -r1.13 ControlDialog.tmpl
--- src/frontends/controllers/ControlDialog.tmpl 27 Mar 2003 17:38:24 -0000 1.13
+++ src/frontends/controllers/ControlDialog.tmpl 18 Jul 2003 01:09:33 -0000
@@ -27,13 +27,13 @@ ControlDialog<Base>::ControlDialog(LyXVi
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,17 @@ 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,11 +62,11 @@ 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>
@@ -75,6 +75,6 @@ void ControlDialog<Base>::hide()
this->emergency_exit_ = false;
clearParams();
- disconnect();
- view().hide();
+ this->disconnect();
+ this->view().hide();
}
Index: src/frontends/controllers/ControlGraphics.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/controllers/ControlGraphics.C,v
retrieving revision 1.65
diff -u -p -r1.65 ControlGraphics.C
--- src/frontends/controllers/ControlGraphics.C 30 Jun 2003 23:56:10 -0000 1.65
+++ src/frontends/controllers/ControlGraphics.C 18 Jul 2003 01:09:33 -0000
@@ -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));
}
Index: src/frontends/qt2/QDialogView.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QDialogView.h,v
retrieving revision 1.5
diff -u -p -r1.5 QDialogView.h
--- src/frontends/qt2/QDialogView.h 22 May 2003 18:14:36 -0000 1.5
+++ src/frontends/qt2/QDialogView.h 18 Jul 2003 01:09:33 -0000
@@ -167,14 +167,14 @@ QController<Controller, Base>::QControll
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());
}
Index: src/frontends/qt2/Qt2Base.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/Qt2Base.h,v
retrieving revision 1.25
diff -u -p -r1.25 Qt2Base.h
--- src/frontends/qt2/Qt2Base.h 22 May 2003 18:14:36 -0000 1.25
+++ src/frontends/qt2/Qt2Base.h 18 Jul 2003 01:09:33 -0000
@@ -168,14 +168,14 @@ Qt2CB<Controller, Base>::Qt2CB(string co
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());
}
Index: src/frontends/xforms/FormBase.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/FormBase.h,v
retrieving revision 1.57
diff -u -p -r1.57 FormBase.h
--- src/frontends/xforms/FormBase.h 22 May 2003 15:42:50 -0000 1.57
+++ src/frontends/xforms/FormBase.h 18 Jul 2003 01:09:33 -0000
@@ -183,14 +183,14 @@ FormCB<Controller, Base>::FormCB(string
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());
}
Index: src/frontends/xforms/FormDialogView.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/FormDialogView.h,v
retrieving revision 1.3
diff -u -p -r1.3 FormDialogView.h
--- src/frontends/xforms/FormDialogView.h 22 May 2003 15:42:50 -0000 1.3
+++ src/frontends/xforms/FormDialogView.h 18 Jul 2003 01:09:33 -0000
@@ -182,14 +182,14 @@ FormController<Controller, Base>::FormCo
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());
}
Index: src/mathed/math_parser.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/math_parser.C,v
retrieving revision 1.282
diff -u -p -r1.282 math_parser.C
--- src/mathed/math_parser.C 16 Jul 2003 14:20:43 -0000 1.282
+++ src/mathed/math_parser.C 18 Jul 2003 01:09:34 -0000
@@ -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;
Index: src/support/BoostFormat.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/support/BoostFormat.h,v
retrieving revision 1.2
diff -u -p -r1.2 BoostFormat.h
--- src/support/BoostFormat.h 18 Jun 2003 09:56:10 -0000 1.2
+++ src/support/BoostFormat.h 18 Jul 2003 01:09:34 -0000
@@ -24,9 +24,6 @@
namespace boost
{
-extern
-template basic_format<char>;
-
extern template
std::ostream &
operator<< <char, std::char_traits<char> >(std::ostream &,
Index: src/tex2lyx/texparser.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/tex2lyx/texparser.C,v
retrieving revision 1.17
diff -u -p -r1.17 texparser.C
--- src/tex2lyx/texparser.C 30 Jun 2003 11:36:08 -0000 1.17
+++ src/tex2lyx/texparser.C 18 Jul 2003 01:09:34 -0000
@@ -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];
}
--
Lgb
