disable concept checks in gtk frontend for gcc 3.4 and above

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9542 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/gtk/Alert_pimpl.C b/src/frontends/gtk/Alert_pimpl.C
index 00f9c433e2c63d3e4329387ce590f8312b235149..dba5fbe7a8f88af7f2fc86070d16b223c5d079a9 100644 (file)
--- a/src/frontends/gtk/Alert_pimpl.C
+++ b/src/frontends/gtk/Alert_pimpl.C
@@ -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 --git a/src/frontends/gtk/ChangeLog b/src/frontends/gtk/ChangeLog
index ca86aff1af7ab1993670139cb23c5e62a46a31c8..4a7c279f0693aacdbc43cfd0c4f3c55b0bfe2707 100644 (file)
--- a/src/frontends/gtk/ChangeLog
+++ b/src/frontends/gtk/ChangeLog
@@ -1,3 +1,11 @@
+2005-01-29  Georg Baum  <Georg.Baum@post.rwth-aachen.de>
+
+       * *.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  <larsbj@gullik.net>
 
        * Several files: use convert<> instead of atoi,strToXXX and friends

diff --git a/src/frontends/gtk/Dialogs.C b/src/frontends/gtk/Dialogs.C
index 0cee5270946e47fc5fb0be5ba387feec7d1e6dff..c36edbcb9000e9c6c0f9d677a30a14a67edd3e8e 100644 (file)
--- a/src/frontends/gtk/Dialogs.C
+++ b/src/frontends/gtk/Dialogs.C
@@ -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 --git a/src/frontends/gtk/FileDialog.C b/src/frontends/gtk/FileDialog.C
index 7aa48f8e2b907927b61c8cc14fdbd03686b55367..829ebba045731eff0183385fe554321ff467db51 100644 (file)
--- a/src/frontends/gtk/FileDialog.C
+++ b/src/frontends/gtk/FileDialog.C
@@ -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 --git a/src/frontends/gtk/FileDialogPrivate.C b/src/frontends/gtk/FileDialogPrivate.C
index 26dcd99c6133ff5b4f184aa10318e6e80a572d7a..ad6bbea86b66875b6b8f12496879793a83f4f9d4 100644 (file)
--- a/src/frontends/gtk/FileDialogPrivate.C
+++ b/src/frontends/gtk/FileDialogPrivate.C
@@ -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 --git a/src/frontends/gtk/GAboutlyx.C b/src/frontends/gtk/GAboutlyx.C
index 1d1a8278088e33ba89dfefa0741a2e245bd42363..5b06755e0938534e70d8bb894fd9af939c385818 100644 (file)
--- a/src/frontends/gtk/GAboutlyx.C
+++ b/src/frontends/gtk/GAboutlyx.C
@@ -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 --git a/src/frontends/gtk/GBC.C b/src/frontends/gtk/GBC.C
index bc6fe2b7458041005c12fdf8983c5846e1029d42..8f238db65913bbb59c4964e58bac7636be2d6404 100644 (file)
--- a/src/frontends/gtk/GBC.C
+++ b/src/frontends/gtk/GBC.C
@@ -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 --git a/src/frontends/gtk/GBox.C b/src/frontends/gtk/GBox.C
index 4d5e95b593584b1a8cd3a64d1d86a0ec9a1c4098..adb17fd1cd6fa2d0b8ccf6c2a1028af70bcbaa7a 100644 (file)
--- a/src/frontends/gtk/GBox.C
+++ b/src/frontends/gtk/GBox.C
@@ -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 --git a/src/frontends/gtk/GChanges.C b/src/frontends/gtk/GChanges.C
index c852927963f73c8762a82ecf9d5946258f4e156c..fe0f0e514b8de96bf62ab36bca6f9a292b2b7f90 100644 (file)
--- a/src/frontends/gtk/GChanges.C
+++ b/src/frontends/gtk/GChanges.C
@@ -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 --git a/src/frontends/gtk/GCharacter.C b/src/frontends/gtk/GCharacter.C
index ffe6c5706dce3051b1545fd46a949aace0926d74..c3caa93a718ca204f1cd1c6c3fc86adfbfe1c596 100644 (file)
--- a/src/frontends/gtk/GCharacter.C
+++ b/src/frontends/gtk/GCharacter.C
@@ -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 --git a/src/frontends/gtk/GERT.C b/src/frontends/gtk/GERT.C
index 4627ee3a6c535324c2126b383ae4c93eccb6092f..ef0b5c4023ad074c893f6c505340809fdff8d17d 100644 (file)
--- a/src/frontends/gtk/GERT.C
+++ b/src/frontends/gtk/GERT.C
@@ -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 --git a/src/frontends/gtk/GErrorList.C b/src/frontends/gtk/GErrorList.C
index 2f2b53e5cbeb8073fc973f5d9502bb5436b2ca2a..83fdfbbffe34083c5badbfac6f8e773acc18da81 100644 (file)
--- a/src/frontends/gtk/GErrorList.C
+++ b/src/frontends/gtk/GErrorList.C
@@ -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 --git a/src/frontends/gtk/GFloat.C b/src/frontends/gtk/GFloat.C
index aa008e850aba9c6ad6bdd6ea2a8274e9c92e584c..816b86afe181f1ce7f5901428bd9c62505c9c619 100644 (file)
--- a/src/frontends/gtk/GFloat.C
+++ b/src/frontends/gtk/GFloat.C
@@ -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 --git a/src/frontends/gtk/GGraphics.C b/src/frontends/gtk/GGraphics.C
index f7b7daacb3a6c080f4d73145906aed1d80cf1040..7679478488886177255acbd549c527225932facd 100644 (file)
--- a/src/frontends/gtk/GGraphics.C
+++ b/src/frontends/gtk/GGraphics.C
@@ -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 --git a/src/frontends/gtk/GInclude.C b/src/frontends/gtk/GInclude.C
index 95c89597c9fbf066360d2d75f6cf6e5db04940f4..6420c4c3c34902078ed6d4c232e8684ac344bcc4 100644 (file)
--- a/src/frontends/gtk/GInclude.C
+++ b/src/frontends/gtk/GInclude.C
@@ -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 --git a/src/frontends/gtk/GLog.C b/src/frontends/gtk/GLog.C
index 7fb0cf6b814d498b2a43436d3c030e817d5f4300..c2f13fa947992af2e45cfc82dfc505a1fb3b7ffb 100644 (file)
--- a/src/frontends/gtk/GLog.C
+++ b/src/frontends/gtk/GLog.C
@@ -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 --git a/src/frontends/gtk/GLyXKeySym.C b/src/frontends/gtk/GLyXKeySym.C
index 73e87c9d2dd1b05cc6462e6ed835c003d5870eac..22c38fb104a2be6e3416685034249b4404bba3a7 100644 (file)
--- a/src/frontends/gtk/GLyXKeySym.C
+++ b/src/frontends/gtk/GLyXKeySym.C
@@ -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 --git a/src/frontends/gtk/GMathDelim.C b/src/frontends/gtk/GMathDelim.C
index bf23037aa07191aac5a7ba94628e09993e99d3d7..1213c239a3f427ddb5bf819a925b25954c60e958 100644 (file)
--- a/src/frontends/gtk/GMathDelim.C
+++ b/src/frontends/gtk/GMathDelim.C
@@ -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 --git a/src/frontends/gtk/GMathPanel.C b/src/frontends/gtk/GMathPanel.C
index 625b9b19ca759bb89bf0ac2f1b4f53f181dac98b..898995d7841d42a88dfc7d166a08f15ee1ccd187 100644 (file)
--- a/src/frontends/gtk/GMathPanel.C
+++ b/src/frontends/gtk/GMathPanel.C
@@ -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 --git a/src/frontends/gtk/GMathsMatrix.C b/src/frontends/gtk/GMathsMatrix.C
index 038da41a860d7f82344dab456166315a5ac93d50..3cfd4649c16532739a9b6908afb93fbe10c039dd 100644 (file)
--- a/src/frontends/gtk/GMathsMatrix.C
+++ b/src/frontends/gtk/GMathsMatrix.C
@@ -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 --git a/src/frontends/gtk/GMenubar.C b/src/frontends/gtk/GMenubar.C
index 76a679d455fe4a6847cefe5eb21df1529d0dabbb..f90780c0f3c37b0bc442c2a029e9a8ca6ca3a04b 100644 (file)
--- a/src/frontends/gtk/GMenubar.C
+++ b/src/frontends/gtk/GMenubar.C
@@ -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(MenuItem const * item,
                                } 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 --git a/src/frontends/gtk/GMiniBuffer.C b/src/frontends/gtk/GMiniBuffer.C
index 3f117a77455978e218f83caaff500f64103dc078..9c920957de7580828553b1c553a1366d2b747c98 100644 (file)
--- a/src/frontends/gtk/GMiniBuffer.C
+++ b/src/frontends/gtk/GMiniBuffer.C
@@ -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 --git a/src/frontends/gtk/GNote.C b/src/frontends/gtk/GNote.C
index 77eb2fb8d0a1a93ca803981ee3f85c22482bf12a..f8f14327ce5342c7cd11e4e3c1b12b34905f0de2 100644 (file)
--- a/src/frontends/gtk/GNote.C
+++ b/src/frontends/gtk/GNote.C
@@ -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 --git a/src/frontends/gtk/GPainter.C b/src/frontends/gtk/GPainter.C
index 7b87fc1cc4804b94ee84cf5bdf0c4b35a7463b18..43d966ecfe378ea9ac634e8911ccabc634cfd88e 100644 (file)
--- a/src/frontends/gtk/GPainter.C
+++ b/src/frontends/gtk/GPainter.C
@@ -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 --git a/src/frontends/gtk/GParagraph.C b/src/frontends/gtk/GParagraph.C
index cb9b37025b1e6002c66bf564039a3f8d1bde0d38..ecaf2d4073fc7fb9f116efb5f1eeeec77f73d4ce 100644 (file)
--- a/src/frontends/gtk/GParagraph.C
+++ b/src/frontends/gtk/GParagraph.C
@@ -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 --git a/src/frontends/gtk/GPrint.C b/src/frontends/gtk/GPrint.C
index cd9de15b83a13e2d4ac4064877486f18d50ba36d..10bbbddf4e688e0a78cd84e45e6cec9f40489dc9 100644 (file)
--- a/src/frontends/gtk/GPrint.C
+++ b/src/frontends/gtk/GPrint.C
@@ -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 --git a/src/frontends/gtk/GScreen.C b/src/frontends/gtk/GScreen.C
index 2bd933637ac0f218fd26e918330927aa52560e91..653250ad807e411f00f80b0ee1a99e3e8a0780a4 100644 (file)
--- a/src/frontends/gtk/GScreen.C
+++ b/src/frontends/gtk/GScreen.C
@@ -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 --git a/src/frontends/gtk/GSearch.C b/src/frontends/gtk/GSearch.C
index cc76ccbe9224e65fe4d2da4ef114b24474c6ea6c..0db25350f21948b42edb67df5577cbcf84db6947 100644 (file)
--- a/src/frontends/gtk/GSearch.C
+++ b/src/frontends/gtk/GSearch.C
@@ -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 --git a/src/frontends/gtk/GSendto.C b/src/frontends/gtk/GSendto.C
index 9dc888884f19f2ae2db75fa8173d64b06929f00a..4ff9179baeb44b285ac012b1c23eaeb26390241f 100644 (file)
--- a/src/frontends/gtk/GSendto.C
+++ b/src/frontends/gtk/GSendto.C
@@ -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 --git a/src/frontends/gtk/GShowFile.C b/src/frontends/gtk/GShowFile.C
index fb9a452f59629333912601823017451b7476f1a1..964a3d765db1b85ec97b760e73ab62b358927359 100644 (file)
--- a/src/frontends/gtk/GShowFile.C
+++ b/src/frontends/gtk/GShowFile.C
@@ -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 --git a/src/frontends/gtk/GSpellchecker.C b/src/frontends/gtk/GSpellchecker.C
index 7646e5734bea265c0fc8e10947ce52828aeca59f..3d8cf5e49ae5789401106a31817d40dc4a88373e 100644 (file)
--- a/src/frontends/gtk/GSpellchecker.C
+++ b/src/frontends/gtk/GSpellchecker.C
@@ -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 --git a/src/frontends/gtk/GTableCreate.C b/src/frontends/gtk/GTableCreate.C
index c8b57c4ac852259555b018bc69ba1ba79f2010dc..5e23b88cc13229fbc9d62dab56fb0f53d766e6f5 100644 (file)
--- a/src/frontends/gtk/GTableCreate.C
+++ b/src/frontends/gtk/GTableCreate.C
@@ -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 --git a/src/frontends/gtk/GTexinfo.C b/src/frontends/gtk/GTexinfo.C
index 9058a4249547fba44a039d78ca2b54ace33fc3d8..b41936f823967b5d9a95d9003575df655d5beec7 100644 (file)
--- a/src/frontends/gtk/GTexinfo.C
+++ b/src/frontends/gtk/GTexinfo.C
@@ -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 --git a/src/frontends/gtk/GText.C b/src/frontends/gtk/GText.C
index 2f28716cd5280727163553415bbeab7956a93573..fd8e41a07bde083e941cf855299cd8da7f6f9c14 100644 (file)
--- a/src/frontends/gtk/GText.C
+++ b/src/frontends/gtk/GText.C
@@ -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 --git a/src/frontends/gtk/GTimeout.C b/src/frontends/gtk/GTimeout.C
index 0603c027b9e97a86cf3d9fe7d6c252c2e4679c3f..afb3a46763083ba67783f0fcd94dfe3d27e151a3 100644 (file)
--- a/src/frontends/gtk/GTimeout.C
+++ b/src/frontends/gtk/GTimeout.C
@@ -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 --git a/src/frontends/gtk/GToc.C b/src/frontends/gtk/GToc.C
index 3b89d83244c0082ab1f3256e5954096e8b471ac6..0c7c77791e82a876af24b9b4d08352c58a38e2a3 100644 (file)
--- a/src/frontends/gtk/GToc.C
+++ b/src/frontends/gtk/GToc.C
@@ -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 --git a/src/frontends/gtk/GToolbar.C b/src/frontends/gtk/GToolbar.C
index b2cb0a6438d47b8945bbb4b252492f9491ff97c6..47c9f5162b4e9b46254b3d6ca98e7b00760a01ef 100644 (file)
--- a/src/frontends/gtk/GToolbar.C
+++ b/src/frontends/gtk/GToolbar.C
@@ -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 --git a/src/frontends/gtk/GUrl.C b/src/frontends/gtk/GUrl.C
index dc0587d5546a36728a37a1f1cdcada4eea49ffe3..6b762dd65a63f0756ccc7227d72847b6322218a9 100644 (file)
--- a/src/frontends/gtk/GUrl.C
+++ b/src/frontends/gtk/GUrl.C
@@ -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 --git a/src/frontends/gtk/GVSpace.C b/src/frontends/gtk/GVSpace.C
index e63aad6f04fbfdf96c9b6e495df57409fd33a9aa..9f2862a0e76d80b641cddef8707dd8a8a0bd6c30 100644 (file)
--- a/src/frontends/gtk/GVSpace.C
+++ b/src/frontends/gtk/GVSpace.C
@@ -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 --git a/src/frontends/gtk/GView.C b/src/frontends/gtk/GView.C
index 742541afa31eeeb45e488b7b402f2120d3e0bb23..e695c21e65d20397c33fbf696ee3b83306a9cd07 100644 (file)
--- a/src/frontends/gtk/GView.C
+++ b/src/frontends/gtk/GView.C
@@ -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 --git a/src/frontends/gtk/GViewBase.C b/src/frontends/gtk/GViewBase.C
index f7762c93c2b5e66220c56ed9cf048acde682ce28..dbee44c9df7685bad2f19a0dd69a823503fa3dd2 100644 (file)
--- a/src/frontends/gtk/GViewBase.C
+++ b/src/frontends/gtk/GViewBase.C
@@ -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 --git a/src/frontends/gtk/GWorkArea.C b/src/frontends/gtk/GWorkArea.C
index 4442e4b0c8ec6ec35246d89faa34996026291604..da1199a13ac54bdc7ef2d7e4adc39dc16226a0cb 100644 (file)
--- a/src/frontends/gtk/GWorkArea.C
+++ b/src/frontends/gtk/GWorkArea.C
@@ -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 --git a/src/frontends/gtk/GXpmBtnTbl.C b/src/frontends/gtk/GXpmBtnTbl.C
index 73390e64b1c6e55a2c905fafc693859002584415..16837071231107eb1b8d62a11046565d3d31be1d 100644 (file)
--- a/src/frontends/gtk/GXpmBtnTbl.C
+++ b/src/frontends/gtk/GXpmBtnTbl.C
@@ -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 --git a/src/frontends/gtk/LyXScreenFactory.C b/src/frontends/gtk/LyXScreenFactory.C
index d0354882110d09cdb52ef6f1eabf3a04e1853e44..61eb1d99297660c64ff54236284eba6ed39ebad0 100644 (file)
--- a/src/frontends/gtk/LyXScreenFactory.C
+++ b/src/frontends/gtk/LyXScreenFactory.C
@@ -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 --git a/src/frontends/gtk/WorkAreaFactory.C b/src/frontends/gtk/WorkAreaFactory.C
index 6c7b8ddf99ddd28dda816b0ddb7c4f59761d0f8d..18c820747e1b222e4edc1ed43fe1139b237de72b 100644 (file)
--- a/src/frontends/gtk/WorkAreaFactory.C
+++ b/src/frontends/gtk/WorkAreaFactory.C
@@ -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 --git a/src/frontends/gtk/ghelpers.C b/src/frontends/gtk/ghelpers.C
index 7d0d85c43e8125d8ff4bf3cee7ca57a3a34937ab..72e5bac497e3a799780805e02260430e51c6de04 100644 (file)
--- a/src/frontends/gtk/ghelpers.C
+++ b/src/frontends/gtk/ghelpers.C
@@ -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 --git a/src/frontends/gtk/io_callback.C b/src/frontends/gtk/io_callback.C
index 3962af05725e44e8d72ff32f77edb5c58c9905a2..24dce3d9d2bb602e288f11d58ef5698d550e74e2 100644 (file)
--- a/src/frontends/gtk/io_callback.C
+++ b/src/frontends/gtk/io_callback.C
@@ -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 --git a/src/frontends/gtk/lyx_gui.C b/src/frontends/gtk/lyx_gui.C
index 64f4affea9b7153825cf602ef079fe816d755d84..dce37c8b81e7cf5da55fd6f7546b90eaf6789e80 100644 (file)
--- a/src/frontends/gtk/lyx_gui.C
+++ b/src/frontends/gtk/lyx_gui.C
@@ -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 --git a/src/frontends/gtk/xftFontLoader.C b/src/frontends/gtk/xftFontLoader.C
index 3024b63dffa842bb7c977b411958de059ec150b2..639d17004d4dc60b1de4e5934affdff9c4e48a3c 100644 (file)
--- a/src/frontends/gtk/xftFontLoader.C
+++ b/src/frontends/gtk/xftFontLoader.C
@@ -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 --git a/src/frontends/gtk/xftFontMetrics.C b/src/frontends/gtk/xftFontMetrics.C
index 09d76a80e4b620579636efcdbe9eb29e0268aca2..8000beade67382b85f8af4901de52e550b6b87ed 100644 (file)
--- a/src/frontends/gtk/xftFontMetrics.C
+++ b/src/frontends/gtk/xftFontMetrics.C
@@ -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