From: Georg Baum Date: Sat, 29 Jan 2005 15:09:14 +0000 (+0000) Subject: disable concept checks in gtk frontend for gcc 3.4 and above X-Git-Tag: 1.6.10~14608 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=5f21ba1f56e028dee44488966ecea1a5576a81fd;p=features.git 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 00f9c433e2..dba5fbe7a8 100644 --- a/src/frontends/gtk/Alert_pimpl.C +++ b/src/frontends/gtk/Alert_pimpl.C @@ -11,6 +11,9 @@ #include // 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 ca86aff1af..4a7c279f06 100644 --- a/src/frontends/gtk/ChangeLog +++ b/src/frontends/gtk/ChangeLog @@ -1,3 +1,11 @@ +2005-01-29 Georg Baum + + * *.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 * 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 0cee527094..c36edbcb90 100644 --- a/src/frontends/gtk/Dialogs.C +++ b/src/frontends/gtk/Dialogs.C @@ -11,6 +11,9 @@ #include // 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 7aa48f8e2b..829ebba045 100644 --- a/src/frontends/gtk/FileDialog.C +++ b/src/frontends/gtk/FileDialog.C @@ -11,6 +11,9 @@ #include // 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 26dcd99c61..ad6bbea86b 100644 --- a/src/frontends/gtk/FileDialogPrivate.C +++ b/src/frontends/gtk/FileDialogPrivate.C @@ -12,6 +12,9 @@ #include // 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 1d1a827808..5b06755e09 100644 --- a/src/frontends/gtk/GAboutlyx.C +++ b/src/frontends/gtk/GAboutlyx.C @@ -11,6 +11,9 @@ #include // 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 bc6fe2b745..8f238db659 100644 --- a/src/frontends/gtk/GBC.C +++ b/src/frontends/gtk/GBC.C @@ -11,6 +11,9 @@ #include // 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 4d5e95b593..adb17fd1cd 100644 --- a/src/frontends/gtk/GBox.C +++ b/src/frontends/gtk/GBox.C @@ -11,6 +11,9 @@ #include // 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 c852927963..fe0f0e514b 100644 --- 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 ffe6c5706d..c3caa93a71 100644 --- a/src/frontends/gtk/GCharacter.C +++ b/src/frontends/gtk/GCharacter.C @@ -11,6 +11,9 @@ #include // 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 4627ee3a6c..ef0b5c4023 100644 --- a/src/frontends/gtk/GERT.C +++ b/src/frontends/gtk/GERT.C @@ -11,6 +11,9 @@ #include // 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 2f2b53e5cb..83fdfbbffe 100644 --- a/src/frontends/gtk/GErrorList.C +++ b/src/frontends/gtk/GErrorList.C @@ -11,6 +11,9 @@ #include // 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 aa008e850a..816b86afe1 100644 --- a/src/frontends/gtk/GFloat.C +++ b/src/frontends/gtk/GFloat.C @@ -11,6 +11,9 @@ #include // 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 f7b7daacb3..7679478488 100644 --- a/src/frontends/gtk/GGraphics.C +++ b/src/frontends/gtk/GGraphics.C @@ -11,6 +11,9 @@ #include // 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 95c89597c9..6420c4c3c3 100644 --- a/src/frontends/gtk/GInclude.C +++ b/src/frontends/gtk/GInclude.C @@ -11,6 +11,9 @@ #include // 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 7fb0cf6b81..c2f13fa947 100644 --- 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 73e87c9d2d..22c38fb104 100644 --- a/src/frontends/gtk/GLyXKeySym.C +++ b/src/frontends/gtk/GLyXKeySym.C @@ -11,6 +11,9 @@ #include // 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 bf23037aa0..1213c239a3 100644 --- a/src/frontends/gtk/GMathDelim.C +++ b/src/frontends/gtk/GMathDelim.C @@ -11,6 +11,9 @@ #include // 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 625b9b19ca..898995d784 100644 --- a/src/frontends/gtk/GMathPanel.C +++ b/src/frontends/gtk/GMathPanel.C @@ -11,6 +11,9 @@ #include // 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 038da41a86..3cfd4649c1 100644 --- a/src/frontends/gtk/GMathsMatrix.C +++ b/src/frontends/gtk/GMathsMatrix.C @@ -11,6 +11,9 @@ #include // 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 76a679d455..f90780c0f3 100644 --- a/src/frontends/gtk/GMenubar.C +++ b/src/frontends/gtk/GMenubar.C @@ -12,6 +12,9 @@ #include // 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 bigicon = Gdk::Pixbuf::create_from_file(xpmName); diff --git a/src/frontends/gtk/GMiniBuffer.C b/src/frontends/gtk/GMiniBuffer.C index 3f117a7745..9c920957de 100644 --- a/src/frontends/gtk/GMiniBuffer.C +++ b/src/frontends/gtk/GMiniBuffer.C @@ -11,6 +11,9 @@ #include // 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 77eb2fb8d0..f8f14327ce 100644 --- a/src/frontends/gtk/GNote.C +++ b/src/frontends/gtk/GNote.C @@ -11,6 +11,9 @@ #include // 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 7b87fc1cc4..43d966ecfe 100644 --- a/src/frontends/gtk/GPainter.C +++ b/src/frontends/gtk/GPainter.C @@ -11,6 +11,9 @@ #include // 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 cb9b37025b..ecaf2d4073 100644 --- a/src/frontends/gtk/GParagraph.C +++ b/src/frontends/gtk/GParagraph.C @@ -11,6 +11,9 @@ #include // 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 cd9de15b83..10bbbddf4e 100644 --- a/src/frontends/gtk/GPrint.C +++ b/src/frontends/gtk/GPrint.C @@ -11,6 +11,9 @@ #include // 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 2bd933637a..653250ad80 100644 --- a/src/frontends/gtk/GScreen.C +++ b/src/frontends/gtk/GScreen.C @@ -11,6 +11,9 @@ #include // 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 cc76ccbe92..0db25350f2 100644 --- a/src/frontends/gtk/GSearch.C +++ b/src/frontends/gtk/GSearch.C @@ -11,6 +11,9 @@ #include // 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 9dc888884f..4ff9179bae 100644 --- a/src/frontends/gtk/GSendto.C +++ b/src/frontends/gtk/GSendto.C @@ -11,6 +11,9 @@ #include // 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 fb9a452f59..964a3d765d 100644 --- 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 7646e5734b..3d8cf5e49a 100644 --- a/src/frontends/gtk/GSpellchecker.C +++ b/src/frontends/gtk/GSpellchecker.C @@ -11,6 +11,9 @@ #include // 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 c8b57c4ac8..5e23b88cc1 100644 --- a/src/frontends/gtk/GTableCreate.C +++ b/src/frontends/gtk/GTableCreate.C @@ -11,6 +11,9 @@ #include // 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 9058a42495..b41936f823 100644 --- 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 2f28716cd5..fd8e41a07b 100644 --- a/src/frontends/gtk/GText.C +++ b/src/frontends/gtk/GText.C @@ -11,6 +11,9 @@ #include // 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 0603c027b9..afb3a46763 100644 --- a/src/frontends/gtk/GTimeout.C +++ b/src/frontends/gtk/GTimeout.C @@ -13,6 +13,9 @@ #include // 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 3b89d83244..0c7c77791e 100644 --- a/src/frontends/gtk/GToc.C +++ b/src/frontends/gtk/GToc.C @@ -11,6 +11,9 @@ #include // 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 b2cb0a6438..47c9f5162b 100644 --- a/src/frontends/gtk/GToolbar.C +++ b/src/frontends/gtk/GToolbar.C @@ -12,6 +12,9 @@ #include // 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 dc0587d554..6b762dd65a 100644 --- a/src/frontends/gtk/GUrl.C +++ b/src/frontends/gtk/GUrl.C @@ -11,6 +11,9 @@ #include // 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 e63aad6f04..9f2862a0e7 100644 --- a/src/frontends/gtk/GVSpace.C +++ b/src/frontends/gtk/GVSpace.C @@ -11,6 +11,9 @@ #include // 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 742541afa3..e695c21e65 100644 --- a/src/frontends/gtk/GView.C +++ b/src/frontends/gtk/GView.C @@ -11,6 +11,9 @@ #include // 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 f7762c93c2..dbee44c9df 100644 --- a/src/frontends/gtk/GViewBase.C +++ b/src/frontends/gtk/GViewBase.C @@ -11,6 +11,9 @@ #include // 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 4442e4b0c8..da1199a13a 100644 --- a/src/frontends/gtk/GWorkArea.C +++ b/src/frontends/gtk/GWorkArea.C @@ -11,6 +11,9 @@ #include // 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 73390e64b1..1683707123 100644 --- a/src/frontends/gtk/GXpmBtnTbl.C +++ b/src/frontends/gtk/GXpmBtnTbl.C @@ -11,6 +11,9 @@ #include // 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 d035488211..61eb1d9929 100644 --- a/src/frontends/gtk/LyXScreenFactory.C +++ b/src/frontends/gtk/LyXScreenFactory.C @@ -11,6 +11,9 @@ #include // 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 6c7b8ddf99..18c820747e 100644 --- a/src/frontends/gtk/WorkAreaFactory.C +++ b/src/frontends/gtk/WorkAreaFactory.C @@ -11,6 +11,9 @@ #include // 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 7d0d85c43e..72e5bac497 100644 --- a/src/frontends/gtk/ghelpers.C +++ b/src/frontends/gtk/ghelpers.C @@ -12,6 +12,9 @@ #include // 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 3962af0572..24dce3d9d2 100644 --- a/src/frontends/gtk/io_callback.C +++ b/src/frontends/gtk/io_callback.C @@ -12,6 +12,9 @@ #include // 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 64f4affea9..dce37c8b81 100644 --- a/src/frontends/gtk/lyx_gui.C +++ b/src/frontends/gtk/lyx_gui.C @@ -13,6 +13,9 @@ #include // 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 3024b63dff..639d17004d 100644 --- a/src/frontends/gtk/xftFontLoader.C +++ b/src/frontends/gtk/xftFontLoader.C @@ -11,6 +11,9 @@ #include // 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 09d76a80e4..8000beade6 100644 --- a/src/frontends/gtk/xftFontMetrics.C +++ b/src/frontends/gtk/xftFontMetrics.C @@ -11,6 +11,9 @@ #include // 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