From: Matthias Maier Date: Fri, 17 Apr 2015 17:03:51 +0000 (+0200) Subject: Use pragma approach for Trilinos' headers X-Git-Tag: v8.3.0-rc1~249^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F830%2Fhead;p=dealii.git Use pragma approach for Trilinos' headers Closes #819 --- diff --git a/cmake/configure/configure_2_trilinos.cmake b/cmake/configure/configure_2_trilinos.cmake index 64d644f306..5971f48998 100644 --- a/cmake/configure/configure_2_trilinos.cmake +++ b/cmake/configure/configure_2_trilinos.cmake @@ -118,12 +118,13 @@ MACRO(FEATURE_TRILINOS_FIND_EXTERNAL var) ENDIF() # - # Trilinos has to be configured with 32bit indices if deal.II uses unsigned int. + # Trilinos has to be configured with 32bit indices if deal.II uses + # unsigned int. # IF(TRILINOS_WITH_NO_32BIT_INDICES AND NOT DEAL_II_WITH_64BIT_INDICES) MESSAGE(STATUS "deal.II was configured to use 32bit global indices but " "Trilinos was not." - ) + ) SET(TRILINOS_ADDITIONAL_ERROR_STRING ${TRILINOS_ADDITIONAL_ERROR_STRING} "The Trilinos installation (found at \"${TRILINOS_DIR}\")\n" @@ -136,8 +137,8 @@ MACRO(FEATURE_TRILINOS_FIND_EXTERNAL var) ENDIF() # - # Trilinos has to be configured with 64bit indices if deal.II uses unsigned long - # long int. + # Trilinos has to be configured with 64bit indices if deal.II uses + # unsigned long long int. # IF(TRILINOS_WITH_NO_64BIT_INDICES AND DEAL_II_WITH_64BIT_INDICES) MESSAGE(STATUS "deal.II was configured to use 64bit global indices but " @@ -191,19 +192,6 @@ MACRO(FEATURE_TRILINOS_CONFIGURE_EXTERNAL) SET(DEAL_II_EXPAND_TRILINOS_BLOCK_SPARSITY_PATTERN "TrilinosWrappers::BlockSparsityPattern") SET(DEAL_II_EXPAND_TRILINOS_MPI_BLOCKVECTOR "TrilinosWrappers::MPI::BlockVector") SET(DEAL_II_EXPAND_TRILINOS_MPI_VECTOR "TrilinosWrappers::MPI::Vector") - - ENABLE_IF_SUPPORTED(TRILINOS_CXX_FLAGS "-Wno-unused-function") - ENABLE_IF_SUPPORTED(TRILINOS_CXX_FLAGS "-Wno-unused-parameter") - ENABLE_IF_SUPPORTED(TRILINOS_CXX_FLAGS "-Wno-unused-variable") - - # - # Disable a bunch of warnings caused by Trilinos headers in older versions: - # - IF(TRILINOS_VERSION VERSION_LESS "11.12") - ENABLE_IF_SUPPORTED(TRILINOS_CXX_FLAGS "-Wno-extra") - ENABLE_IF_SUPPORTED(TRILINOS_CXX_FLAGS "-Wno-overloaded-virtual") - ENABLE_IF_SUPPORTED(TRILINOS_CXX_FLAGS "-Wno-unused") - ENDIF() ENDMACRO() diff --git a/include/deal.II/lac/trilinos_precondition.h b/include/deal.II/lac/trilinos_precondition.h index 9f06443572..62784dd179 100644 --- a/include/deal.II/lac/trilinos_precondition.h +++ b/include/deal.II/lac/trilinos_precondition.h @@ -27,6 +27,7 @@ # include # include +DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # ifdef DEAL_II_WITH_MPI # include # else @@ -42,6 +43,7 @@ # include # include # endif +DEAL_II_ENABLE_EXTRA_DIAGNOSTICS // forward declarations class Ifpack_Preconditioner; diff --git a/include/deal.II/lac/trilinos_solver.h b/include/deal.II/lac/trilinos_solver.h index 9f643bad36..4167993ab4 100644 --- a/include/deal.II/lac/trilinos_solver.h +++ b/include/deal.II/lac/trilinos_solver.h @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2008 - 2014 by the deal.II authors +// Copyright (C) 2008 - 2015 by the deal.II authors // // This file is part of the deal.II library. // @@ -27,10 +27,13 @@ # include # include +DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # include # include # include # include +DEAL_II_ENABLE_EXTRA_DIAGNOSTICS + DEAL_II_NAMESPACE_OPEN diff --git a/include/deal.II/lac/trilinos_sparse_matrix.h b/include/deal.II/lac/trilinos_sparse_matrix.h index ad3f90f61f..fe952ebe19 100644 --- a/include/deal.II/lac/trilinos_sparse_matrix.h +++ b/include/deal.II/lac/trilinos_sparse_matrix.h @@ -34,6 +34,8 @@ # include # define TrilinosScalar double + +DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # include # include # include @@ -44,6 +46,7 @@ # else # include "Epetra_SerialComm.h" # endif +DEAL_II_ENABLE_EXTRA_DIAGNOSTICS class Epetra_Export; diff --git a/include/deal.II/lac/trilinos_sparsity_pattern.h b/include/deal.II/lac/trilinos_sparsity_pattern.h index a23bcbc993..ac0f948d79 100644 --- a/include/deal.II/lac/trilinos_sparsity_pattern.h +++ b/include/deal.II/lac/trilinos_sparsity_pattern.h @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2008 - 2014 by the deal.II authors +// Copyright (C) 2008 - 2015 by the deal.II authors // // This file is part of the deal.II library. // @@ -31,6 +31,7 @@ # include +DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # include # include # ifdef DEAL_II_WITH_MPI @@ -39,6 +40,8 @@ # else # include "Epetra_SerialComm.h" # endif +DEAL_II_ENABLE_EXTRA_DIAGNOSTICS + DEAL_II_NAMESPACE_OPEN diff --git a/include/deal.II/lac/trilinos_vector.h b/include/deal.II/lac/trilinos_vector.h index c57d0929a4..9d7c076279 100644 --- a/include/deal.II/lac/trilinos_vector.h +++ b/include/deal.II/lac/trilinos_vector.h @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2008 - 2014 by the deal.II authors +// Copyright (C) 2008 - 2015 by the deal.II authors // // This file is part of the deal.II library. // @@ -29,8 +29,10 @@ # include # include +DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # include "Epetra_Map.h" # include "Epetra_LocalMap.h" +DEAL_II_ENABLE_EXTRA_DIAGNOSTICS DEAL_II_NAMESPACE_OPEN diff --git a/include/deal.II/lac/trilinos_vector_base.h b/include/deal.II/lac/trilinos_vector_base.h index a628429039..ec2da796cc 100644 --- a/include/deal.II/lac/trilinos_vector_base.h +++ b/include/deal.II/lac/trilinos_vector_base.h @@ -31,6 +31,7 @@ # include # include +DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # define TrilinosScalar double # include "Epetra_ConfigDefs.h" # ifdef DEAL_II_WITH_MPI // only if MPI is installed @@ -40,6 +41,7 @@ # include "Epetra_SerialComm.h" # endif # include "Epetra_FEVector.h" +DEAL_II_ENABLE_EXTRA_DIAGNOSTICS DEAL_II_NAMESPACE_OPEN diff --git a/source/lac/trilinos_precondition.cc b/source/lac/trilinos_precondition.cc index ce47fdda0e..76c6c94bcd 100644 --- a/source/lac/trilinos_precondition.cc +++ b/source/lac/trilinos_precondition.cc @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2008 - 2014 by the deal.II authors +// Copyright (C) 2008 - 2015 by the deal.II authors // // This file is part of the deal.II library. // @@ -21,6 +21,7 @@ # include # include +DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # include # include # include @@ -32,6 +33,7 @@ #include #include #endif +DEAL_II_ENABLE_EXTRA_DIAGNOSTICS DEAL_II_NAMESPACE_OPEN diff --git a/source/lac/trilinos_sparse_matrix.cc b/source/lac/trilinos_sparse_matrix.cc index 6b5c05cf75..13bab016c2 100644 --- a/source/lac/trilinos_sparse_matrix.cc +++ b/source/lac/trilinos_sparse_matrix.cc @@ -24,10 +24,12 @@ # include # include +DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # include # include # include # include +DEAL_II_ENABLE_EXTRA_DIAGNOSTICS DEAL_II_NAMESPACE_OPEN diff --git a/source/lac/trilinos_sparsity_pattern.cc b/source/lac/trilinos_sparsity_pattern.cc index 6c4913eabf..247389a796 100644 --- a/source/lac/trilinos_sparsity_pattern.cc +++ b/source/lac/trilinos_sparsity_pattern.cc @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2008 - 2014 by the deal.II authors +// Copyright (C) 2008 - 2015 by the deal.II authors // // This file is part of the deal.II library. // @@ -21,7 +21,9 @@ # include # include +DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # include +DEAL_II_ENABLE_EXTRA_DIAGNOSTICS DEAL_II_NAMESPACE_OPEN diff --git a/source/lac/trilinos_vector.cc b/source/lac/trilinos_vector.cc index f09397c543..eadd00c906 100644 --- a/source/lac/trilinos_vector.cc +++ b/source/lac/trilinos_vector.cc @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2008 - 2014 by the deal.II authors +// Copyright (C) 2008 - 2015 by the deal.II authors // // This file is part of the deal.II library. // @@ -19,8 +19,11 @@ # include # include + +DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # include # include +DEAL_II_ENABLE_EXTRA_DIAGNOSTICS # include diff --git a/source/lac/trilinos_vector_base.cc b/source/lac/trilinos_vector_base.cc index ad8356a833..552b534c49 100644 --- a/source/lac/trilinos_vector_base.cc +++ b/source/lac/trilinos_vector_base.cc @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2008 - 2014 by the deal.II authors +// Copyright (C) 2008 - 2015 by the deal.II authors // // This file is part of the deal.II library. // @@ -19,8 +19,11 @@ #ifdef DEAL_II_WITH_TRILINOS # include + +DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # include # include +DEAL_II_ENABLE_EXTRA_DIAGNOSTICS DEAL_II_NAMESPACE_OPEN