From 3793c0733f53edd116ffb5c581e15c0a4af5b4c9 Mon Sep 17 00:00:00 2001 From: wolf Date: Tue, 7 Jan 2003 21:43:02 +0000 Subject: [PATCH] Remove at least one of the bogus checks. The other one causes ICEs when removed. git-svn-id: https://svn.dealii.org/trunk@6884 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/aclocal.m4 | 61 --------------------------- deal.II/base/include/base/config.h.in | 8 +--- deal.II/configure.in | 1 - 3 files changed, 1 insertion(+), 69 deletions(-) diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4 index 1d71d3387e..e1f50cd522 100644 --- a/deal.II/aclocal.m4 +++ b/deal.II/aclocal.m4 @@ -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 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; -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 struct Y { - typedef void (Class::*FunPtr) (); - FunPtr fun_ptr; - Class *object; - void foo () { - (object->*fun_ptr)(); - }; - }; - - struct X {}; - - template class Y; - ], - [], - [ - 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 diff --git a/deal.II/base/include/base/config.h.in b/deal.II/base/include/base/config.h.in index e9bf8556f5..742111ade4 100644 --- a/deal.II/base/include/base/config.h.in +++ b/deal.II/base/include/base/config.h.in @@ -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 @@ -36,12 +36,6 @@ */ #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 diff --git a/deal.II/configure.in b/deal.II/configure.in index 2ec89b9ac4..76ab623b7d 100644 --- a/deal.II/configure.in +++ b/deal.II/configure.in @@ -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 -- 2.39.5