From 0641c55741ca9d25992548efa67c718abf62cd0c Mon Sep 17 00:00:00 2001 From: maier Date: Wed, 23 Apr 2014 11:20:01 +0000 Subject: [PATCH] Revert "CMake: Silence warning w654 with icc: "overloaded virtual function is only partially overriden" - I assume this is intended..." No not intended and we schould fix it.. git-svn-id: https://svn.dealii.org/trunk@32814 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/cmake/setup_compiler_flags_intel.cmake | 2 -- 1 file changed, 2 deletions(-) diff --git a/deal.II/cmake/setup_compiler_flags_intel.cmake b/deal.II/cmake/setup_compiler_flags_intel.cmake index 6008630e1e..33f19fc8fc 100644 --- a/deal.II/cmake/setup_compiler_flags_intel.cmake +++ b/deal.II/cmake/setup_compiler_flags_intel.cmake @@ -91,7 +91,6 @@ ENABLE_IF_SUPPORTED(DEAL_II_CXX_FLAGS "-w2") # references; however, it's the only useful way to do # so if you need an invalid value for a reference) # -w383 value copied to temporary, reference to temporary used -# -w654 overloaded virtual function is only partially overriden # -w981 operands are evaluated in unspecified order # -w1418 external function definition with no prior declaration # (happens in boost) @@ -111,7 +110,6 @@ ENABLE_IF_SUPPORTED(DEAL_II_CXX_FLAGS "-wd193") ENABLE_IF_SUPPORTED(DEAL_II_CXX_FLAGS "-wd279") ENABLE_IF_SUPPORTED(DEAL_II_CXX_FLAGS "-wd327") ENABLE_IF_SUPPORTED(DEAL_II_CXX_FLAGS "-wd383") -ENABLE_IF_SUPPORTED(DEAL_II_CXX_FLAGS "-wd654") ENABLE_IF_SUPPORTED(DEAL_II_CXX_FLAGS "-wd981") ENABLE_IF_SUPPORTED(DEAL_II_CXX_FLAGS "-wd1418") ENABLE_IF_SUPPORTED(DEAL_II_CXX_FLAGS "-wd1478") -- 2.39.5