The attached patch squashes two compiler warnings and disables concept
checks for gcc 3.4 and above in the gtk frontend. The latter is mainly
the result of a little sed script.
Note that some files that work with concept checks enabled when compiled
with gcc 3.3.x don't work with enabled concept checks and gcc 4.0 anymore
(the failure is not in our code, but libsigc++).
Committing now.
Georg
diff -p -r -U 3 -X excl.tmp lyx-1.4-clean/src/frontends/gtk/Alert_pimpl.C lyx-1.4-cvs/src/frontends/gtk/Alert_pimpl.C
--- lyx-1.4-clean/src/frontends/gtk/Alert_pimpl.C 2004-11-18 13:50:35.000000000 +0100
+++ lyx-1.4-cvs/src/frontends/gtk/Alert_pimpl.C 2005-01-29 15:17:06.000000000 +0100
@@ -11,6 +11,9 @@
#include <config.h>
// Too hard to make concept checks work with this file
+#ifdef _GLIBCXX_CONCEPT_CHECKS
+#undef _GLIBCXX_CONCEPT_CHECKS
+#endif
#ifdef _GLIBCPP_CONCEPT_CHECKS
#undef _GLIBCPP_CONCEPT_CHECKS
#endif
Nur in lyx-1.4-cvs/src/frontends/gtk: cc.
diff -p -r -U 3 -X excl.tmp lyx-1.4-clean/src/frontends/gtk/ChangeLog lyx-1.4-cvs/src/frontends/gtk/ChangeLog
--- lyx-1.4-clean/src/frontends/gtk/ChangeLog 2005-01-29 12:19:45.000000000 +0100
+++ lyx-1.4-cvs/src/frontends/gtk/ChangeLog 2005-01-29 15:30:38.000000000 +0100
@@ -1,3 +1,11 @@
+2005-01-29 Georg Baum <[EMAIL PROTECTED]>
+
+ * *.C: make ugly concept check hack work with gcc 3.4 and above
+ (fixes bug 1745)
+ * GMenubar.C (onSubMenuActivate): use Glib::ustring::npos instead of
+ -1
+ * GTexinfo.C (onItemActivate): squash compiler warning
+
2005-01-27 Lars Gullik Bjonnes <[EMAIL PROTECTED]>
* Several files: use convert<> instead of atoi,strToXXX and friends
diff -p -r -U 3 -X excl.tmp lyx-1.4-clean/src/frontends/gtk/Dialogs.C lyx-1.4-cvs/src/frontends/gtk/Dialogs.C
--- lyx-1.4-clean/src/frontends/gtk/Dialogs.C 2004-12-19 11:36:56.000000000 +0100
+++ lyx-1.4-cvs/src/frontends/gtk/Dialogs.C 2005-01-29 15:17:06.000000000 +0100
@@ -11,6 +11,9 @@
#include <config.h>
// Too hard to make concept checks work with this file
+#ifdef _GLIBCXX_CONCEPT_CHECKS
+#undef _GLIBCXX_CONCEPT_CHECKS
+#endif
#ifdef _GLIBCPP_CONCEPT_CHECKS
#undef _GLIBCPP_CONCEPT_CHECKS
#endif
diff -p -r -U 3 -X excl.tmp lyx-1.4-clean/src/frontends/gtk/FileDialog.C lyx-1.4-cvs/src/frontends/gtk/FileDialog.C
--- lyx-1.4-clean/src/frontends/gtk/FileDialog.C 2004-11-18 13:50:35.000000000 +0100
+++ lyx-1.4-cvs/src/frontends/gtk/FileDialog.C 2005-01-29 15:17:06.000000000 +0100
@@ -11,6 +11,9 @@
#include <config.h>
// Too hard to make concept checks work with this file
+#ifdef _GLIBCXX_CONCEPT_CHECKS
+#undef _GLIBCXX_CONCEPT_CHECKS
+#endif
#ifdef _GLIBCPP_CONCEPT_CHECKS
#undef _GLIBCPP_CONCEPT_CHECKS
#endif
diff -p -r -U 3 -X excl.tmp lyx-1.4-clean/src/frontends/gtk/FileDialogPrivate.C lyx-1.4-cvs/src/frontends/gtk/FileDialogPrivate.C
--- lyx-1.4-clean/src/frontends/gtk/FileDialogPrivate.C 2004-12-19 11:36:56.000000000 +0100
+++ lyx-1.4-cvs/src/frontends/gtk/FileDialogPrivate.C 2005-01-29 15:17:06.000000000 +0100
@@ -12,6 +12,9 @@
#include <config.h>
// Too hard to make concept checks work with this file
+#ifdef _GLIBCXX_CONCEPT_CHECKS
+#undef _GLIBCXX_CONCEPT_CHECKS
+#endif
#ifdef _GLIBCPP_CONCEPT_CHECKS
#undef _GLIBCPP_CONCEPT_CHECKS
#endif
diff -p -r -U 3 -X excl.tmp lyx-1.4-clean/src/frontends/gtk/GAboutlyx.C lyx-1.4-cvs/src/frontends/gtk/GAboutlyx.C
--- lyx-1.4-clean/src/frontends/gtk/GAboutlyx.C 2004-11-18 13:50:35.000000000 +0100
+++ lyx-1.4-cvs/src/frontends/gtk/GAboutlyx.C 2005-01-29 15:17:06.000000000 +0100
@@ -11,6 +11,9 @@
#include <config.h>
// Too hard to make concept checks work with this file
+#ifdef _GLIBCXX_CONCEPT_CHECKS
+#undef _GLIBCXX_CONCEPT_CHECKS
+#endif
#ifdef _GLIBCPP_CONCEPT_CHECKS
#undef _GLIBCPP_CONCEPT_CHECKS
#endif
diff -p -r -U 3 -X excl.tmp lyx-1.4-clean/src/frontends/gtk/GBC.C lyx-1.4-cvs/src/frontends/gtk/GBC.C
--- lyx-1.4-clean/src/frontends/gtk/GBC.C 2004-11-18 13:50:35.000000000 +0100
+++ lyx-1.4-cvs/src/frontends/gtk/GBC.C 2005-01-29 15:17:06.000000000 +0100
@@ -11,6 +11,9 @@
#include <config.h>
// Too hard to make concept checks work with this file
+#ifdef _GLIBCXX_CONCEPT_CHECKS
+#undef _GLIBCXX_CONCEPT_CHECKS
+#endif
#ifdef _GLIBCPP_CONCEPT_CHECKS
#undef _GLIBCPP_CONCEPT_CHECKS
#endif
diff -p -r -U 3 -X excl.tmp lyx-1.4-clean/src/frontends/gtk/GBox.C lyx-1.4-cvs/src/frontends/gtk/GBox.C
--- lyx-1.4-clean/src/frontends/gtk/GBox.C 2004-11-26 17:57:37.000000000 +0100
+++ lyx-1.4-cvs/src/frontends/gtk/GBox.C 2005-01-29 15:17:06.000000000 +0100
@@ -11,6 +11,9 @@
#include <config.h>
// Too hard to make concept checks work with this file
+#ifdef _GLIBCXX_CONCEPT_CHECKS
+#undef _GLIBCXX_CONCEPT_CHECKS
+#endif
#ifdef _GLIBCPP_CONCEPT_CHECKS
#undef _GLIBCPP_CONCEPT_CHECKS
#endif
diff -p -r -U 3 -X excl.tmp lyx-1.4-clean/src/frontends/gtk/GChanges.C lyx-1.4-cvs/src/frontends/gtk/GChanges.C
--- lyx-1.4-clean/src/frontends/gtk/GChanges.C 2004-10-27 13:34:49.000000000 +0200
+++ lyx-1.4-cvs/src/frontends/gtk/GChanges.C 2005-01-29 15:20:11.000000000 +0100
@@ -8,6 +8,11 @@
* Full author contact details are available in file CREDITS.
*/
+// Too hard to make concept checks work with this file
+#ifdef _GLIBCXX_CONCEPT_CHECKS
+#undef _GLIBCXX_CONCEPT_CHECKS
+#endif
+
#include "GChanges.h"
#include "ControlChanges.h"
diff -p -r -U 3 -X excl.tmp lyx-1.4-clean/src/frontends/gtk/GCharacter.C lyx-1.4-cvs/src/frontends/gtk/GCharacter.C
--- lyx-1.4-clean/src/frontends/gtk/GCharacter.C 2004-11-18 13:50:35.000000000 +0100
+++ lyx-1.4-cvs/src/frontends/gtk/GCharacter.C 2005-01-29 15:17:06.000000000 +0100
@@ -11,6 +11,9 @@
#include <config.h>
// Too hard to make concept checks work with this file
+#ifdef _GLIBCXX_CONCEPT_CHECKS
+#undef _GLIBCXX_CONCEPT_CHECKS
+#endif
#ifdef _GLIBCPP_CONCEPT_CHECKS
#undef _GLIBCPP_CONCEPT_CHECKS
#endif
diff -p -r -U 3 -X excl.tmp lyx-1.4-clean/src/frontends/gtk/GErrorList.C lyx-1.4-cvs/src/frontends/gtk/GErrorList.C
--- lyx-1.4-clean/src/frontends/gtk/GErrorList.C 2004-12-02 14:05:16.000000000 +0100
+++ lyx-1.4-cvs/src/frontends/gtk/GErrorList.C 2005-01-29 15:17:06.000000000 +0100
@@ -11,6 +11,9 @@
#include <config.h>
// Too hard to make concept checks work with this file
+#ifdef _GLIBCXX_CONCEPT_CHECKS
+#undef _GLIBCXX_CONCEPT_CHECKS
+#endif
#ifdef _GLIBCPP_CONCEPT_CHECKS
#undef _GLIBCPP_CONCEPT_CHECKS
#endif
diff -p -r -U 3 -X excl.tmp lyx-1.4-clean/src/frontends/gtk/GERT.C lyx-1.4-cvs/src/frontends/gtk/GERT.C
--- lyx-1.4-clean/src/frontends/gtk/GERT.C 2004-11-17 00:18:45.000000000 +0100
+++ lyx-1.4-cvs/src/frontends/gtk/GERT.C 2005-01-29 15:17:06.000000000 +0100
@@ -11,6 +11,9 @@
#include <config.h>
// Too hard to make concept checks work with this file
+#ifdef _GLIBCXX_CONCEPT_CHECKS
+#undef _GLIBCXX_CONCEPT_CHECKS
+#endif
#ifdef _GLIBCPP_CONCEPT_CHECKS
#undef _GLIBCPP_CONCEPT_CHECKS
#endif
diff -p -r -U 3 -X excl.tmp lyx-1.4-clean/src/frontends/gtk/GFloat.C lyx-1.4-cvs/src/frontends/gtk/GFloat.C
--- lyx-1.4-clean/src/frontends/gtk/GFloat.C 2004-11-17 00:18:45.000000000 +0100
+++ lyx-1.4-cvs/src/frontends/gtk/GFloat.C 2005-01-29 15:17:06.000000000 +0100
@@ -11,6 +11,9 @@
#include <config.h>
// Too hard to make concept checks work with this file
+#ifdef _GLIBCXX_CONCEPT_CHECKS
+#undef _GLIBCXX_CONCEPT_CHECKS
+#endif
#ifdef _GLIBCPP_CONCEPT_CHECKS
#undef _GLIBCPP_CONCEPT_CHECKS
#endif
diff -p -r -U 3 -X excl.tmp lyx-1.4-clean/src/frontends/gtk/GGraphics.C lyx-1.4-cvs/src/frontends/gtk/GGraphics.C
--- lyx-1.4-clean/src/frontends/gtk/GGraphics.C 2005-01-29 12:19:45.000000000 +0100
+++ lyx-1.4-cvs/src/frontends/gtk/GGraphics.C 2005-01-29 15:17:06.000000000 +0100
@@ -11,6 +11,9 @@
#include <config.h>
// Too hard to make concept checks work with this file
+#ifdef _GLIBCXX_CONCEPT_CHECKS
+#undef _GLIBCXX_CONCEPT_CHECKS
+#endif
#ifdef _GLIBCPP_CONCEPT_CHECKS
#undef _GLIBCPP_CONCEPT_CHECKS
#endif
diff -p -r -U 3 -X excl.tmp lyx-1.4-clean/src/frontends/gtk/ghelpers.C lyx-1.4-cvs/src/frontends/gtk/ghelpers.C
--- lyx-1.4-clean/src/frontends/gtk/ghelpers.C 2005-01-11 19:38:41.000000000 +0100
+++ lyx-1.4-cvs/src/frontends/gtk/ghelpers.C 2005-01-29 15:17:06.000000000 +0100
@@ -12,6 +12,9 @@
#include <config.h>
// Too hard to make concept checks work with this file
+#ifdef _GLIBCXX_CONCEPT_CHECKS
+#undef _GLIBCXX_CONCEPT_CHECKS
+#endif
#ifdef _GLIBCPP_CONCEPT_CHECKS
#undef _GLIBCPP_CONCEPT_CHECKS
#endif
diff -p -r -U 3 -X excl.tmp lyx-1.4-clean/src/frontends/gtk/GInclude.C lyx-1.4-cvs/src/frontends/gtk/GInclude.C
--- lyx-1.4-clean/src/frontends/gtk/GInclude.C 2004-12-07 01:29:15.000000000 +0100
+++ lyx-1.4-cvs/src/frontends/gtk/GInclude.C 2005-01-29 15:17:06.000000000 +0100
@@ -11,6 +11,9 @@
#include <config.h>
// Too hard to make concept checks work with this file
+#ifdef _GLIBCXX_CONCEPT_CHECKS
+#undef _GLIBCXX_CONCEPT_CHECKS
+#endif
#ifdef _GLIBCPP_CONCEPT_CHECKS
#undef _GLIBCPP_CONCEPT_CHECKS
#endif
diff -p -r -U 3 -X excl.tmp lyx-1.4-clean/src/frontends/gtk/GLog.C lyx-1.4-cvs/src/frontends/gtk/GLog.C
--- lyx-1.4-clean/src/frontends/gtk/GLog.C 2004-10-09 15:51:05.000000000 +0200
+++ lyx-1.4-cvs/src/frontends/gtk/GLog.C 2005-01-29 15:24:06.000000000 +0100
@@ -8,6 +8,11 @@
* Full author contact details are available in file CREDITS.
*/
+// Too hard to make concept checks work with this file
+#ifdef _GLIBCXX_CONCEPT_CHECKS
+#undef _GLIBCXX_CONCEPT_CHECKS
+#endif
+
#include "GLog.h"
#include "ControlLog.h"
diff -p -r -U 3 -X excl.tmp lyx-1.4-clean/src/frontends/gtk/GLyXKeySym.C lyx-1.4-cvs/src/frontends/gtk/GLyXKeySym.C
--- lyx-1.4-clean/src/frontends/gtk/GLyXKeySym.C 2004-11-18 13:50:36.000000000 +0100
+++ lyx-1.4-cvs/src/frontends/gtk/GLyXKeySym.C 2005-01-29 15:17:06.000000000 +0100
@@ -11,6 +11,9 @@
#include <config.h>
// Too hard to make concept checks work with this file
+#ifdef _GLIBCXX_CONCEPT_CHECKS
+#undef _GLIBCXX_CONCEPT_CHECKS
+#endif
#ifdef _GLIBCPP_CONCEPT_CHECKS
#undef _GLIBCPP_CONCEPT_CHECKS
#endif
diff -p -r -U 3 -X excl.tmp lyx-1.4-clean/src/frontends/gtk/GMathDelim.C lyx-1.4-cvs/src/frontends/gtk/GMathDelim.C
--- lyx-1.4-clean/src/frontends/gtk/GMathDelim.C 2004-11-18 13:50:36.000000000 +0100
+++ lyx-1.4-cvs/src/frontends/gtk/GMathDelim.C 2005-01-29 15:17:06.000000000 +0100
@@ -11,6 +11,9 @@
#include <config.h>
// Too hard to make concept checks work with this file
+#ifdef _GLIBCXX_CONCEPT_CHECKS
+#undef _GLIBCXX_CONCEPT_CHECKS
+#endif
#ifdef _GLIBCPP_CONCEPT_CHECKS
#undef _GLIBCPP_CONCEPT_CHECKS
#endif
diff -p -r -U 3 -X excl.tmp lyx-1.4-clean/src/frontends/gtk/GMathPanel.C lyx-1.4-cvs/src/frontends/gtk/GMathPanel.C
--- lyx-1.4-clean/src/frontends/gtk/GMathPanel.C 2004-11-18 13:50:36.000000000 +0100
+++ lyx-1.4-cvs/src/frontends/gtk/GMathPanel.C 2005-01-29 15:17:06.000000000 +0100
@@ -11,6 +11,9 @@
#include <config.h>
// Too hard to make concept checks work with this file
+#ifdef _GLIBCXX_CONCEPT_CHECKS
+#undef _GLIBCXX_CONCEPT_CHECKS
+#endif
#ifdef _GLIBCPP_CONCEPT_CHECKS
#undef _GLIBCPP_CONCEPT_CHECKS
#endif
diff -p -r -U 3 -X excl.tmp lyx-1.4-clean/src/frontends/gtk/GMathsMatrix.C lyx-1.4-cvs/src/frontends/gtk/GMathsMatrix.C
--- lyx-1.4-clean/src/frontends/gtk/GMathsMatrix.C 2004-12-02 14:05:16.000000000 +0100
+++ lyx-1.4-cvs/src/frontends/gtk/GMathsMatrix.C 2005-01-29 15:17:06.000000000 +0100
@@ -11,6 +11,9 @@
#include <config.h>
// Too hard to make concept checks work with this file
+#ifdef _GLIBCXX_CONCEPT_CHECKS
+#undef _GLIBCXX_CONCEPT_CHECKS
+#endif
#ifdef _GLIBCPP_CONCEPT_CHECKS
#undef _GLIBCPP_CONCEPT_CHECKS
#endif
diff -p -r -U 3 -X excl.tmp lyx-1.4-clean/src/frontends/gtk/GMenubar.C lyx-1.4-cvs/src/frontends/gtk/GMenubar.C
--- lyx-1.4-clean/src/frontends/gtk/GMenubar.C 2004-11-18 13:50:36.000000000 +0100
+++ lyx-1.4-cvs/src/frontends/gtk/GMenubar.C 2005-01-29 15:17:06.000000000 +0100
@@ -12,6 +12,9 @@
#include <config.h>
// Too hard to make concept checks work with this file
+#ifdef _GLIBCXX_CONCEPT_CHECKS
+#undef _GLIBCXX_CONCEPT_CHECKS
+#endif
#ifdef _GLIBCPP_CONCEPT_CHECKS
#undef _GLIBCPP_CONCEPT_CHECKS
#endif
@@ -192,7 +195,7 @@ void GMenubar::onSubMenuActivate(MenuIte
} else {
Glib::ustring xpmName =
Glib::locale_to_utf8(toolbarbackend.getIcon(i->func()));
- if (xpmName.find("unknown.xpm") == -1) {
+ if (xpmName.find("unknown.xpm") == Glib::ustring::npos) {
// Load icon and shrink it for menu size
Glib::RefPtr<Gdk::Pixbuf> bigicon =
Gdk::Pixbuf::create_from_file(xpmName);
diff -p -r -U 3 -X excl.tmp lyx-1.4-clean/src/frontends/gtk/GMiniBuffer.C lyx-1.4-cvs/src/frontends/gtk/GMiniBuffer.C
--- lyx-1.4-clean/src/frontends/gtk/GMiniBuffer.C 2004-11-18 13:50:37.000000000 +0100
+++ lyx-1.4-cvs/src/frontends/gtk/GMiniBuffer.C 2005-01-29 15:17:06.000000000 +0100
@@ -11,6 +11,9 @@
#include <config.h>
// Too hard to make concept checks work with this file
+#ifdef _GLIBCXX_CONCEPT_CHECKS
+#undef _GLIBCXX_CONCEPT_CHECKS
+#endif
#ifdef _GLIBCPP_CONCEPT_CHECKS
#undef _GLIBCPP_CONCEPT_CHECKS
#endif
diff -p -r -U 3 -X excl.tmp lyx-1.4-clean/src/frontends/gtk/GNote.C lyx-1.4-cvs/src/frontends/gtk/GNote.C
--- lyx-1.4-clean/src/frontends/gtk/GNote.C 2004-11-17 00:18:45.000000000 +0100
+++ lyx-1.4-cvs/src/frontends/gtk/GNote.C 2005-01-29 15:17:06.000000000 +0100
@@ -11,6 +11,9 @@
#include <config.h>
// Too hard to make concept checks work with this file
+#ifdef _GLIBCXX_CONCEPT_CHECKS
+#undef _GLIBCXX_CONCEPT_CHECKS
+#endif
#ifdef _GLIBCPP_CONCEPT_CHECKS
#undef _GLIBCPP_CONCEPT_CHECKS
#endif
diff -p -r -U 3 -X excl.tmp lyx-1.4-clean/src/frontends/gtk/GPainter.C lyx-1.4-cvs/src/frontends/gtk/GPainter.C
--- lyx-1.4-clean/src/frontends/gtk/GPainter.C 2004-11-18 13:50:37.000000000 +0100
+++ lyx-1.4-cvs/src/frontends/gtk/GPainter.C 2005-01-29 15:17:06.000000000 +0100
@@ -11,6 +11,9 @@
#include <config.h>
// Too hard to make concept checks work with this file
+#ifdef _GLIBCXX_CONCEPT_CHECKS
+#undef _GLIBCXX_CONCEPT_CHECKS
+#endif
#ifdef _GLIBCPP_CONCEPT_CHECKS
#undef _GLIBCPP_CONCEPT_CHECKS
#endif
diff -p -r -U 3 -X excl.tmp lyx-1.4-clean/src/frontends/gtk/GParagraph.C lyx-1.4-cvs/src/frontends/gtk/GParagraph.C
--- lyx-1.4-clean/src/frontends/gtk/GParagraph.C 2005-01-06 20:28:20.000000000 +0100
+++ lyx-1.4-cvs/src/frontends/gtk/GParagraph.C 2005-01-29 15:17:06.000000000 +0100
@@ -11,6 +11,9 @@
#include <config.h>
// Too hard to make concept checks work with this file
+#ifdef _GLIBCXX_CONCEPT_CHECKS
+#undef _GLIBCXX_CONCEPT_CHECKS
+#endif
#ifdef _GLIBCPP_CONCEPT_CHECKS
#undef _GLIBCPP_CONCEPT_CHECKS
#endif
diff -p -r -U 3 -X excl.tmp lyx-1.4-clean/src/frontends/gtk/GPrint.C lyx-1.4-cvs/src/frontends/gtk/GPrint.C
--- lyx-1.4-clean/src/frontends/gtk/GPrint.C 2005-01-29 12:19:45.000000000 +0100
+++ lyx-1.4-cvs/src/frontends/gtk/GPrint.C 2005-01-29 15:17:06.000000000 +0100
@@ -11,6 +11,9 @@
#include <config.h>
// Too hard to make concept checks work with this file
+#ifdef _GLIBCXX_CONCEPT_CHECKS
+#undef _GLIBCXX_CONCEPT_CHECKS
+#endif
#ifdef _GLIBCPP_CONCEPT_CHECKS
#undef _GLIBCPP_CONCEPT_CHECKS
#endif
diff -p -r -U 3 -X excl.tmp lyx-1.4-clean/src/frontends/gtk/GScreen.C lyx-1.4-cvs/src/frontends/gtk/GScreen.C
--- lyx-1.4-clean/src/frontends/gtk/GScreen.C 2004-11-18 13:50:37.000000000 +0100
+++ lyx-1.4-cvs/src/frontends/gtk/GScreen.C 2005-01-29 15:17:06.000000000 +0100
@@ -11,6 +11,9 @@
#include <config.h>
// Too hard to make concept checks work with this file
+#ifdef _GLIBCXX_CONCEPT_CHECKS
+#undef _GLIBCXX_CONCEPT_CHECKS
+#endif
#ifdef _GLIBCPP_CONCEPT_CHECKS
#undef _GLIBCPP_CONCEPT_CHECKS
#endif
diff -p -r -U 3 -X excl.tmp lyx-1.4-clean/src/frontends/gtk/GSearch.C lyx-1.4-cvs/src/frontends/gtk/GSearch.C
--- lyx-1.4-clean/src/frontends/gtk/GSearch.C 2004-12-19 11:36:57.000000000 +0100
+++ lyx-1.4-cvs/src/frontends/gtk/GSearch.C 2005-01-29 15:17:06.000000000 +0100
@@ -11,6 +11,9 @@
#include <config.h>
// Too hard to make concept checks work with this file
+#ifdef _GLIBCXX_CONCEPT_CHECKS
+#undef _GLIBCXX_CONCEPT_CHECKS
+#endif
#ifdef _GLIBCPP_CONCEPT_CHECKS
#undef _GLIBCPP_CONCEPT_CHECKS
#endif
diff -p -r -U 3 -X excl.tmp lyx-1.4-clean/src/frontends/gtk/GSendto.C lyx-1.4-cvs/src/frontends/gtk/GSendto.C
--- lyx-1.4-clean/src/frontends/gtk/GSendto.C 2004-11-22 15:03:32.000000000 +0100
+++ lyx-1.4-cvs/src/frontends/gtk/GSendto.C 2005-01-29 15:17:06.000000000 +0100
@@ -11,6 +11,9 @@
#include <config.h>
// Too hard to make concept checks work with this file
+#ifdef _GLIBCXX_CONCEPT_CHECKS
+#undef _GLIBCXX_CONCEPT_CHECKS
+#endif
#ifdef _GLIBCPP_CONCEPT_CHECKS
#undef _GLIBCPP_CONCEPT_CHECKS
#endif
diff -p -r -U 3 -X excl.tmp lyx-1.4-clean/src/frontends/gtk/GShowFile.C lyx-1.4-cvs/src/frontends/gtk/GShowFile.C
--- lyx-1.4-clean/src/frontends/gtk/GShowFile.C 2004-10-09 09:51:36.000000000 +0200
+++ lyx-1.4-cvs/src/frontends/gtk/GShowFile.C 2005-01-29 15:27:20.000000000 +0100
@@ -8,6 +8,11 @@
* Full author contact details are available in file CREDITS.
*/
+// Too hard to make concept checks work with this file
+#ifdef _GLIBCXX_CONCEPT_CHECKS
+#undef _GLIBCXX_CONCEPT_CHECKS
+#endif
+
#include "GShowFile.h"
#include "ControlShowFile.h"
diff -p -r -U 3 -X excl.tmp lyx-1.4-clean/src/frontends/gtk/GSpellchecker.C lyx-1.4-cvs/src/frontends/gtk/GSpellchecker.C
--- lyx-1.4-clean/src/frontends/gtk/GSpellchecker.C 2005-01-06 20:28:20.000000000 +0100
+++ lyx-1.4-cvs/src/frontends/gtk/GSpellchecker.C 2005-01-29 15:17:06.000000000 +0100
@@ -11,6 +11,9 @@
#include <config.h>
// Too hard to make concept checks work with this file
+#ifdef _GLIBCXX_CONCEPT_CHECKS
+#undef _GLIBCXX_CONCEPT_CHECKS
+#endif
#ifdef _GLIBCPP_CONCEPT_CHECKS
#undef _GLIBCPP_CONCEPT_CHECKS
#endif
diff -p -r -U 3 -X excl.tmp lyx-1.4-clean/src/frontends/gtk/GTableCreate.C lyx-1.4-cvs/src/frontends/gtk/GTableCreate.C
--- lyx-1.4-clean/src/frontends/gtk/GTableCreate.C 2004-12-03 14:51:12.000000000 +0100
+++ lyx-1.4-cvs/src/frontends/gtk/GTableCreate.C 2005-01-29 15:17:06.000000000 +0100
@@ -11,6 +11,9 @@
#include <config.h>
// Too hard to make concept checks work with this file
+#ifdef _GLIBCXX_CONCEPT_CHECKS
+#undef _GLIBCXX_CONCEPT_CHECKS
+#endif
#ifdef _GLIBCPP_CONCEPT_CHECKS
#undef _GLIBCPP_CONCEPT_CHECKS
#endif
diff -p -r -U 3 -X excl.tmp lyx-1.4-clean/src/frontends/gtk/GTexinfo.C lyx-1.4-cvs/src/frontends/gtk/GTexinfo.C
--- lyx-1.4-clean/src/frontends/gtk/GTexinfo.C 2004-10-08 20:21:42.000000000 +0200
+++ lyx-1.4-cvs/src/frontends/gtk/GTexinfo.C 2005-01-29 15:29:35.000000000 +0100
@@ -8,6 +8,11 @@
* Full author contact details are available in file CREDITS.
*/
+// Too hard to make concept checks work with this file
+#ifdef _GLIBCXX_CONCEPT_CHECKS
+#undef _GLIBCXX_CONCEPT_CHECKS
+#endif
+
#include "GTexinfo.h"
#include "ghelpers.h"
@@ -90,7 +95,7 @@ void GTexinfo::doBuild() {
void GTexinfo::onItemActivate(
Gtk::TreeModel::Path const & path,
- Gtk::TreeViewColumn * col)
+ Gtk::TreeViewColumn * /* col */)
{
int const choice =
(*itemsstore_->get_iter(path))[listColIndex_];
diff -p -r -U 3 -X excl.tmp lyx-1.4-clean/src/frontends/gtk/GText.C lyx-1.4-cvs/src/frontends/gtk/GText.C
--- lyx-1.4-clean/src/frontends/gtk/GText.C 2004-11-18 13:50:37.000000000 +0100
+++ lyx-1.4-cvs/src/frontends/gtk/GText.C 2005-01-29 15:17:06.000000000 +0100
@@ -11,6 +11,9 @@
#include <config.h>
// Too hard to make concept checks work with this file
+#ifdef _GLIBCXX_CONCEPT_CHECKS
+#undef _GLIBCXX_CONCEPT_CHECKS
+#endif
#ifdef _GLIBCPP_CONCEPT_CHECKS
#undef _GLIBCPP_CONCEPT_CHECKS
#endif
diff -p -r -U 3 -X excl.tmp lyx-1.4-clean/src/frontends/gtk/GTimeout.C lyx-1.4-cvs/src/frontends/gtk/GTimeout.C
--- lyx-1.4-clean/src/frontends/gtk/GTimeout.C 2004-11-18 13:50:37.000000000 +0100
+++ lyx-1.4-cvs/src/frontends/gtk/GTimeout.C 2005-01-29 15:17:06.000000000 +0100
@@ -13,6 +13,9 @@
#include <config.h>
// Too hard to make concept checks work with this file
+#ifdef _GLIBCXX_CONCEPT_CHECKS
+#undef _GLIBCXX_CONCEPT_CHECKS
+#endif
#ifdef _GLIBCPP_CONCEPT_CHECKS
#undef _GLIBCPP_CONCEPT_CHECKS
#endif
diff -p -r -U 3 -X excl.tmp lyx-1.4-clean/src/frontends/gtk/GToc.C lyx-1.4-cvs/src/frontends/gtk/GToc.C
--- lyx-1.4-clean/src/frontends/gtk/GToc.C 2004-11-18 13:50:38.000000000 +0100
+++ lyx-1.4-cvs/src/frontends/gtk/GToc.C 2005-01-29 15:17:06.000000000 +0100
@@ -11,6 +11,9 @@
#include <config.h>
// Too hard to make concept checks work with this file
+#ifdef _GLIBCXX_CONCEPT_CHECKS
+#undef _GLIBCXX_CONCEPT_CHECKS
+#endif
#ifdef _GLIBCPP_CONCEPT_CHECKS
#undef _GLIBCPP_CONCEPT_CHECKS
#endif
diff -p -r -U 3 -X excl.tmp lyx-1.4-clean/src/frontends/gtk/GToolbar.C lyx-1.4-cvs/src/frontends/gtk/GToolbar.C
--- lyx-1.4-clean/src/frontends/gtk/GToolbar.C 2004-11-29 18:47:41.000000000 +0100
+++ lyx-1.4-cvs/src/frontends/gtk/GToolbar.C 2005-01-29 15:17:06.000000000 +0100
@@ -12,6 +12,9 @@
#include <config.h>
// Too hard to make concept checks work with this file
+#ifdef _GLIBCXX_CONCEPT_CHECKS
+#undef _GLIBCXX_CONCEPT_CHECKS
+#endif
#ifdef _GLIBCPP_CONCEPT_CHECKS
#undef _GLIBCPP_CONCEPT_CHECKS
#endif
diff -p -r -U 3 -X excl.tmp lyx-1.4-clean/src/frontends/gtk/GUrl.C lyx-1.4-cvs/src/frontends/gtk/GUrl.C
--- lyx-1.4-clean/src/frontends/gtk/GUrl.C 2004-11-18 13:50:38.000000000 +0100
+++ lyx-1.4-cvs/src/frontends/gtk/GUrl.C 2005-01-29 15:17:06.000000000 +0100
@@ -11,6 +11,9 @@
#include <config.h>
// Too hard to make concept checks work with this file
+#ifdef _GLIBCXX_CONCEPT_CHECKS
+#undef _GLIBCXX_CONCEPT_CHECKS
+#endif
#ifdef _GLIBCPP_CONCEPT_CHECKS
#undef _GLIBCPP_CONCEPT_CHECKS
#endif
diff -p -r -U 3 -X excl.tmp lyx-1.4-clean/src/frontends/gtk/GViewBase.C lyx-1.4-cvs/src/frontends/gtk/GViewBase.C
--- lyx-1.4-clean/src/frontends/gtk/GViewBase.C 2004-11-18 13:50:38.000000000 +0100
+++ lyx-1.4-cvs/src/frontends/gtk/GViewBase.C 2005-01-29 15:17:06.000000000 +0100
@@ -11,6 +11,9 @@
#include <config.h>
// Too hard to make concept checks work with this file
+#ifdef _GLIBCXX_CONCEPT_CHECKS
+#undef _GLIBCXX_CONCEPT_CHECKS
+#endif
#ifdef _GLIBCPP_CONCEPT_CHECKS
#undef _GLIBCPP_CONCEPT_CHECKS
#endif
diff -p -r -U 3 -X excl.tmp lyx-1.4-clean/src/frontends/gtk/GView.C lyx-1.4-cvs/src/frontends/gtk/GView.C
--- lyx-1.4-clean/src/frontends/gtk/GView.C 2004-11-18 13:50:38.000000000 +0100
+++ lyx-1.4-cvs/src/frontends/gtk/GView.C 2005-01-29 15:17:06.000000000 +0100
@@ -11,6 +11,9 @@
#include <config.h>
// Too hard to make concept checks work with this file
+#ifdef _GLIBCXX_CONCEPT_CHECKS
+#undef _GLIBCXX_CONCEPT_CHECKS
+#endif
#ifdef _GLIBCPP_CONCEPT_CHECKS
#undef _GLIBCPP_CONCEPT_CHECKS
#endif
diff -p -r -U 3 -X excl.tmp lyx-1.4-clean/src/frontends/gtk/GVSpace.C lyx-1.4-cvs/src/frontends/gtk/GVSpace.C
--- lyx-1.4-clean/src/frontends/gtk/GVSpace.C 2004-11-17 00:18:45.000000000 +0100
+++ lyx-1.4-cvs/src/frontends/gtk/GVSpace.C 2005-01-29 15:17:06.000000000 +0100
@@ -11,6 +11,9 @@
#include <config.h>
// Too hard to make concept checks work with this file
+#ifdef _GLIBCXX_CONCEPT_CHECKS
+#undef _GLIBCXX_CONCEPT_CHECKS
+#endif
#ifdef _GLIBCPP_CONCEPT_CHECKS
#undef _GLIBCPP_CONCEPT_CHECKS
#endif
diff -p -r -U 3 -X excl.tmp lyx-1.4-clean/src/frontends/gtk/GWorkArea.C lyx-1.4-cvs/src/frontends/gtk/GWorkArea.C
--- lyx-1.4-clean/src/frontends/gtk/GWorkArea.C 2004-11-23 09:17:32.000000000 +0100
+++ lyx-1.4-cvs/src/frontends/gtk/GWorkArea.C 2005-01-29 15:17:06.000000000 +0100
@@ -11,6 +11,9 @@
#include <config.h>
// Too hard to make concept checks work with this file
+#ifdef _GLIBCXX_CONCEPT_CHECKS
+#undef _GLIBCXX_CONCEPT_CHECKS
+#endif
#ifdef _GLIBCPP_CONCEPT_CHECKS
#undef _GLIBCPP_CONCEPT_CHECKS
#endif
diff -p -r -U 3 -X excl.tmp lyx-1.4-clean/src/frontends/gtk/GXpmBtnTbl.C lyx-1.4-cvs/src/frontends/gtk/GXpmBtnTbl.C
--- lyx-1.4-clean/src/frontends/gtk/GXpmBtnTbl.C 2004-11-18 13:50:38.000000000 +0100
+++ lyx-1.4-cvs/src/frontends/gtk/GXpmBtnTbl.C 2005-01-29 15:17:06.000000000 +0100
@@ -11,6 +11,9 @@
#include <config.h>
// Too hard to make concept checks work with this file
+#ifdef _GLIBCXX_CONCEPT_CHECKS
+#undef _GLIBCXX_CONCEPT_CHECKS
+#endif
#ifdef _GLIBCPP_CONCEPT_CHECKS
#undef _GLIBCPP_CONCEPT_CHECKS
#endif
diff -p -r -U 3 -X excl.tmp lyx-1.4-clean/src/frontends/gtk/io_callback.C lyx-1.4-cvs/src/frontends/gtk/io_callback.C
--- lyx-1.4-clean/src/frontends/gtk/io_callback.C 2004-11-18 13:50:38.000000000 +0100
+++ lyx-1.4-cvs/src/frontends/gtk/io_callback.C 2005-01-29 15:17:06.000000000 +0100
@@ -12,6 +12,9 @@
#include <config.h>
// Too hard to make concept checks work with this file
+#ifdef _GLIBCXX_CONCEPT_CHECKS
+#undef _GLIBCXX_CONCEPT_CHECKS
+#endif
#ifdef _GLIBCPP_CONCEPT_CHECKS
#undef _GLIBCPP_CONCEPT_CHECKS
#endif
diff -p -r -U 3 -X excl.tmp lyx-1.4-clean/src/frontends/gtk/lyx_gui.C lyx-1.4-cvs/src/frontends/gtk/lyx_gui.C
--- lyx-1.4-clean/src/frontends/gtk/lyx_gui.C 2005-01-11 19:38:41.000000000 +0100
+++ lyx-1.4-cvs/src/frontends/gtk/lyx_gui.C 2005-01-29 15:17:06.000000000 +0100
@@ -13,6 +13,9 @@
#include <config.h>
// Too hard to make concept checks work with this file
+#ifdef _GLIBCXX_CONCEPT_CHECKS
+#undef _GLIBCXX_CONCEPT_CHECKS
+#endif
#ifdef _GLIBCPP_CONCEPT_CHECKS
#undef _GLIBCPP_CONCEPT_CHECKS
#endif
diff -p -r -U 3 -X excl.tmp lyx-1.4-clean/src/frontends/gtk/LyXScreenFactory.C lyx-1.4-cvs/src/frontends/gtk/LyXScreenFactory.C
--- lyx-1.4-clean/src/frontends/gtk/LyXScreenFactory.C 2004-11-18 13:50:38.000000000 +0100
+++ lyx-1.4-cvs/src/frontends/gtk/LyXScreenFactory.C 2005-01-29 15:17:06.000000000 +0100
@@ -11,6 +11,9 @@
#include <config.h>
// Too hard to make concept checks work with this file
+#ifdef _GLIBCXX_CONCEPT_CHECKS
+#undef _GLIBCXX_CONCEPT_CHECKS
+#endif
#ifdef _GLIBCPP_CONCEPT_CHECKS
#undef _GLIBCPP_CONCEPT_CHECKS
#endif
diff -p -r -U 3 -X excl.tmp lyx-1.4-clean/src/frontends/gtk/WorkAreaFactory.C lyx-1.4-cvs/src/frontends/gtk/WorkAreaFactory.C
--- lyx-1.4-clean/src/frontends/gtk/WorkAreaFactory.C 2004-11-18 13:50:38.000000000 +0100
+++ lyx-1.4-cvs/src/frontends/gtk/WorkAreaFactory.C 2005-01-29 15:17:06.000000000 +0100
@@ -11,6 +11,9 @@
#include <config.h>
// Too hard to make concept checks work with this file
+#ifdef _GLIBCXX_CONCEPT_CHECKS
+#undef _GLIBCXX_CONCEPT_CHECKS
+#endif
#ifdef _GLIBCPP_CONCEPT_CHECKS
#undef _GLIBCPP_CONCEPT_CHECKS
#endif
diff -p -r -U 3 -X excl.tmp lyx-1.4-clean/src/frontends/gtk/xftFontLoader.C lyx-1.4-cvs/src/frontends/gtk/xftFontLoader.C
--- lyx-1.4-clean/src/frontends/gtk/xftFontLoader.C 2005-01-29 12:19:45.000000000 +0100
+++ lyx-1.4-cvs/src/frontends/gtk/xftFontLoader.C 2005-01-29 15:17:06.000000000 +0100
@@ -11,6 +11,9 @@
#include <config.h>
// Too hard to make concept checks work with this file
+#ifdef _GLIBCXX_CONCEPT_CHECKS
+#undef _GLIBCXX_CONCEPT_CHECKS
+#endif
#ifdef _GLIBCPP_CONCEPT_CHECKS
#undef _GLIBCPP_CONCEPT_CHECKS
#endif
diff -p -r -U 3 -X excl.tmp lyx-1.4-clean/src/frontends/gtk/xftFontMetrics.C lyx-1.4-cvs/src/frontends/gtk/xftFontMetrics.C
--- lyx-1.4-clean/src/frontends/gtk/xftFontMetrics.C 2004-11-18 13:50:39.000000000 +0100
+++ lyx-1.4-cvs/src/frontends/gtk/xftFontMetrics.C 2005-01-29 15:17:06.000000000 +0100
@@ -11,6 +11,9 @@
#include <config.h>
// Too hard to make concept checks work with this file
+#ifdef _GLIBCXX_CONCEPT_CHECKS
+#undef _GLIBCXX_CONCEPT_CHECKS
+#endif
#ifdef _GLIBCPP_CONCEPT_CHECKS
#undef _GLIBCPP_CONCEPT_CHECKS
#endif
