From: maier Date: Wed, 31 Oct 2012 15:49:57 +0000 (+0000) Subject: Remove an unused bug and an unused feature test X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4784b4f305c9309bff7c9ada69de3545ab479d67;p=dealii-svn.git Remove an unused bug and an unused feature test git-svn-id: https://svn.dealii.org/branches/branch_cmake@27265 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/cmake/checks/check_for_compiler_bugs.cmake b/deal.II/cmake/checks/check_for_compiler_bugs.cmake index 9341426cba..9d7bd356b0 100644 --- a/deal.II/cmake/checks/check_for_compiler_bugs.cmake +++ b/deal.II/cmake/checks/check_for_compiler_bugs.cmake @@ -203,46 +203,6 @@ CHECK_CXX_COMPILER_BUG( ) -# -# Some versions of gcc get this example wrong: -# -# struct X -# { -# template void operator << (T); -# }; -# int main() -# { -# X x; -# x.operator << (1); -# } -# -# They want to see a "template" for disambiguation in -# x.template operator << (1); -# which shouldn't be necessary since the left hand side of the -# dot operator is not template dependent. Surprisingly, this is -# only the case for operators, not if operator<< were a regular -# function. Annoyingly, other compilers barf on seeing the -# disambiguating "template" keyword. -# -# - Wolfgang Bangerth, Matthias Maier, rewritten 2012 -# -CHECK_CXX_COMPILER_BUG( - " - struct X - { - template void operator << (T) {} - }; - int main() - { - X x; - x.operator << (1); - return 0; - } - " - DEAL_II_TEMPL_OP_DISAMBIGUATION_BUG - ) - - # # Some older versions of gcc compile this, despite the 'explicit' # keyword: diff --git a/deal.II/cmake/checks/check_for_compiler_features.cmake b/deal.II/cmake/checks/check_for_compiler_features.cmake index aaec422483..32ef352c1d 100644 --- a/deal.II/cmake/checks/check_for_compiler_features.cmake +++ b/deal.II/cmake/checks/check_for_compiler_features.cmake @@ -280,25 +280,6 @@ CHECK_CXX_SOURCE_COMPILES( -# -# Check if the declared prototype of abort() has a throw() -# specification. We overload abort() in our testsuite, so have -# to make sure that we match the exception specification -# correctly. -# -# (Yes. It is not a bug. But the logic is the same.) -# -# - Matthias Maier, rewritten 2012 -# -CHECK_CXX_COMPILER_BUG( - " - #include - extern \"C\" void abort () { for(;;) ; } - int main(){ return 0; } - " - DEAL_II_ABORT_NOTHROW_EXCEPTION) - - # # Gcc and some other compilers have __PRETTY_FUNCTION__, showing # an unmangled version of the function we are presently in, diff --git a/deal.II/include/deal.II/base/config.h.in b/deal.II/include/deal.II/base/config.h.in index d595920ef1..571646cc3a 100644 --- a/deal.II/include/deal.II/base/config.h.in +++ b/deal.II/include/deal.II/base/config.h.in @@ -368,10 +368,6 @@ */ #cmakedefine DEAL_II_COMPILER_USE_VECTOR_ARITHMETICS -/* Defined if the prototype of abort() has a no-throw exception specification. - */ -#cmakedefine DEAL_II_ABORT_NOTHROW_EXCEPTION - /* If already available, do not define at all. Otherwise, define to * __func__ if that is available. In all other cases, indicate that no * information about the present function is available for this compiler. @@ -419,13 +415,6 @@ */ #cmakedefine DEAL_II_MEMBER_ARRAY_SPECIALIZATION_BUG -/* Defined if the compiler requires the use of the template keyword for - * disambiguation keyword in certain contexts in which it is not supposed to - * do so. For the exact failure mode, look at aclocal.m4 in the top-level - * directory. - */ -#cmakedefine DEAL_II_TEMPL_OP_DISAMBIGUATION_BUG - /* Defined if the compiler does not honor the explicit keyword on template * constructors. */ @@ -524,3 +513,4 @@ #include #endif +