From: Phillip Mobley Date: Thu, 23 Jul 2020 03:00:56 +0000 (-0400) Subject: Added in pre-processor check to see if signals is already defined. If so, alert the... X-Git-Tag: v9.3.0-rc1~1253^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f5e899939f71e4c28c66c86d336435461a046c2;p=dealii.git Added in pre-processor check to see if signals is already defined. If so, alert the user with a potential fix --- diff --git a/include/deal.II/grid/tria.h b/include/deal.II/grid/tria.h index d5d7652f1c..1398971ca9 100644 --- a/include/deal.II/grid/tria.h +++ b/include/deal.II/grid/tria.h @@ -45,6 +45,13 @@ DEAL_II_NAMESPACE_OPEN +#ifdef signals +# error \ + "The data type signals is already defined. You are most likely using the QT library \ +and using the signals keyword. You can either #include the Qt headers (or any conflicting headers) \ +after the deal.ii headers or you can define the QT_NO_KEYWORDS marco and use the Q_SIGNALS macro." +#endif + // Forward declarations #ifndef DOXYGEN template diff --git a/include/deal.II/multigrid/multigrid.h b/include/deal.II/multigrid/multigrid.h index d8ed117e1b..8661943393 100644 --- a/include/deal.II/multigrid/multigrid.h +++ b/include/deal.II/multigrid/multigrid.h @@ -36,6 +36,13 @@ DEAL_II_NAMESPACE_OPEN +#ifdef signals +# error \ + "The data type signals is already defined. You are most likely using the QT library \ +and using the signals keyword. You can either #include the Qt headers (or any conflicting headers) \ +after the deal.ii headers or you can define the QT_NO_KEYWORDS marco and use the Q_SIGNALS macro." +#endif + /*!@addtogroup mg */ /*@{*/