]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Remove at least one of the bogus checks. The other one causes ICEs when removed.
authorwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 7 Jan 2003 21:43:02 +0000 (21:43 +0000)
committerwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 7 Jan 2003 21:43:02 +0000 (21:43 +0000)
git-svn-id: https://svn.dealii.org/trunk@6884 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/aclocal.m4
deal.II/base/include/base/config.h.in
deal.II/configure.in

index 1d71d3387e1997c417fe2db77b7de7e26e61935b..e1f50cd52236a9d61827ec3f2c694af88493a897 100644 (file)
@@ -1965,67 +1965,6 @@ AC_DEFUN(DEAL_II_CHECK_TEMPL_CONST_MEM_PTR_BUG, dnl
 
 
 
-dnl -------------------------------------------------------------
-dnl More Intel ICC 5.0.1 compiler lossage with pointers to constant
-dnl member functions
-dnl ---------------------------------
-dnl template <class Class> struct Y {
-dnl   typedef void (Class::*FunPtr) ();
-dnl   FunPtr fun_ptr;
-dnl   Class *object;
-dnl   void foo () {
-dnl     (object->*fun_ptr)();
-dnl   };
-dnl };
-dnl
-dnl struct X {};
-dnl
-dnl template class Y<const X>;
-dnl ---------------------------------
-dnl Again, it does not store the information that the member function pointer
-dnl refers to a constant object, so complains that the object is constant,
-dnl but the member function is not.
-dnl
-dnl Usage: DEAL_II_CHECK_CONST_MEM_FUN_PTR_BUG
-dnl
-dnl -------------------------------------------------------------
-AC_DEFUN(DEAL_II_CHECK_CONST_MEM_FUN_PTR_BUG, dnl
-[
-  AC_MSG_CHECKING(for const member function pointers bug)
-  AC_LANG(C++)
-  CXXFLAGS="$CXXFLAGSG"
-  AC_TRY_COMPILE(
-    [
-       template <class Class> struct Y {
-         typedef void (Class::*FunPtr) ();
-         FunPtr fun_ptr;
-         Class *object;
-         void foo () {
-           (object->*fun_ptr)();
-         };
-       };
-
-       struct X {};
-
-       template class Y<const X>;
-    ],
-    [],
-    [
-      AC_MSG_RESULT(no)
-    ],
-    [
-      AC_MSG_RESULT(yes. using workaround)
-      AC_DEFINE(DEAL_II_CONST_MEM_FUN_PTR_BUG, 1, 
-                     [Define if we have to work around another bug in Intel's icc
-                      compiler in which the compiler refuses to store the const
-                      attribute at a member function pointer with a constant class.
-                      See the aclocal.m4 file in the top-level directory
-                      for a description of this bug.])
-    ])
-])
-
-
-
 dnl -------------------------------------------------------------
 dnl DEC/Compaq's cxx compiler does not want us to implement
 dnl virtual functions that were declared abstract before. We do
index e9bf8556f5b296dae5b42c188610a162b232df02..742111ade499de1830a539aef2abefefc3566508 100644 (file)
@@ -5,7 +5,7 @@
 //    $Id$
 //    Version: $Name$
 //
-//    Copyright (C) 2001, 2002, 2003 by the deal.II authors
+//    Copyright (C) 2001, 2002 by the deal.II authors
 //
 //    This file is subject to QPL and may not be  distributed
 //    without copyright and license information. Please refer
    */
 #undef DEAL_II_COMPAT_MAPPING
 
-/* Define if we have to work around another bug in Intel's icc compiler in
-   which the compiler refuses to store the const attribute at a member
-   function pointer with a constant class. See the aclocal.m4 file in the
-   top-level directory for a description of this bug. */
-#undef DEAL_II_CONST_MEM_FUN_PTR_BUG
-
 /* Flag indicating whether the library shall be compiled to use the Tecplot
    interface */
 #undef DEAL_II_HAVE_TECPLOT
index 2ec89b9ac444b48c3adb16ef73f32de126c84f7c..76ab623b7dc23ae5623d6f6d0eb77cdc37e3ec20 100644 (file)
@@ -170,7 +170,6 @@ DEAL_II_CHECK_MEMBER_OP_TEMPLATE_INST
 DEAL_II_CHECK_NAMESP_TEMPL_FRIEND_BUG
 DEAL_II_CHECK_TEMPL_SPEC_FRIEND_BUG
 DEAL_II_CHECK_TEMPL_CONST_MEM_PTR_BUG
-DEAL_II_CHECK_CONST_MEM_FUN_PTR_BUG
 DEAL_II_CHECK_IMPLEMENTED_PURE_FUNCTION_BUG
 DEAL_II_CHECK_TEMPLATE_TEMPLATE_TYPEDEF_BUG
 DEAL_II_CHECK_NESTED_CLASS_FRIEND_BUG

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.