]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Use pragma approach for Trilinos' headers 830/head
authorMatthias Maier <tamiko@43-1.org>
Fri, 17 Apr 2015 17:03:51 +0000 (19:03 +0200)
committerMatthias Maier <tamiko@43-1.org>
Fri, 17 Apr 2015 22:47:25 +0000 (00:47 +0200)
Closes #819

12 files changed:
cmake/configure/configure_2_trilinos.cmake
include/deal.II/lac/trilinos_precondition.h
include/deal.II/lac/trilinos_solver.h
include/deal.II/lac/trilinos_sparse_matrix.h
include/deal.II/lac/trilinos_sparsity_pattern.h
include/deal.II/lac/trilinos_vector.h
include/deal.II/lac/trilinos_vector_base.h
source/lac/trilinos_precondition.cc
source/lac/trilinos_sparse_matrix.cc
source/lac/trilinos_sparsity_pattern.cc
source/lac/trilinos_vector.cc
source/lac/trilinos_vector_base.cc

index 64d644f30645ffb2807a12e9b08e52d92416dbdb..5971f48998dce1d2a46fc8d751a5a6cdc2a57126 100644 (file)
@@ -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()
 
 
index 9f064435727e7870714f150f66d42deb7037f634..62784dd17998bb6cab5a33fcae2c9feb8b5b2190 100644 (file)
@@ -27,6 +27,7 @@
 #  include <deal.II/lac/trilinos_vector_base.h>
 #  include <deal.II/lac/parallel_vector.h>
 
+DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #  ifdef DEAL_II_WITH_MPI
 #    include <Epetra_MpiComm.h>
 #  else
@@ -42,6 +43,7 @@
 #  include <MueLu.hpp>
 #  include <Teuchos_RCP.hpp>
 #  endif
+DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 // forward declarations
 class Ifpack_Preconditioner;
index 9f643bad365c73c2261b3ee4a22a484ce2e0ee86..4167993ab42e1fdc0764d5f083e2e75abe7d4f61 100644 (file)
@@ -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.
 //
 #  include <deal.II/lac/vector.h>
 #  include <deal.II/lac/parallel_vector.h>
 
+DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #  include <Epetra_LinearProblem.h>
 #  include <AztecOO.h>
 #  include <Epetra_Operator.h>
 #  include <Amesos.h>
+DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
+
 
 DEAL_II_NAMESPACE_OPEN
 
index ad3f90f61fa1dfbd18e4b6254ac00e6352d107ea..fe952ebe19a781f004eab9feb4e9188b2342ac26 100644 (file)
@@ -34,6 +34,8 @@
 #  include <memory>
 
 #  define TrilinosScalar double
+
+DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #  include <Epetra_FECrsMatrix.h>
 #  include <Epetra_Map.h>
 #  include <Epetra_CrsGraph.h>
@@ -44,6 +46,7 @@
 #  else
 #    include "Epetra_SerialComm.h"
 #  endif
+DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 class Epetra_Export;
 
index a23bcbc9939a9c13509fc4edb10af4dd4b24cadd..ac0f948d79d29c8fadce79064b9b1a2fc95c1c86 100644 (file)
@@ -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/base/std_cxx11/shared_ptr.h>
 
+DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #  include <Epetra_FECrsGraph.h>
 #  include <Epetra_Map.h>
 #  ifdef DEAL_II_WITH_MPI
@@ -39,6 +40,8 @@
 #  else
 #    include "Epetra_SerialComm.h"
 #  endif
+DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
+
 
 DEAL_II_NAMESPACE_OPEN
 
index c57d0929a4cc9b071ff5296ea4cf3cc5cde248a0..9d7c076279edec35fd62b23fa09b078fe0930576 100644 (file)
@@ -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.
 //
 #  include <deal.II/lac/vector.h>
 #  include <deal.II/lac/trilinos_vector_base.h>
 
+DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #  include "Epetra_Map.h"
 #  include "Epetra_LocalMap.h"
+DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 DEAL_II_NAMESPACE_OPEN
 
index a628429039c6c7a976176797246b358d0f544c1d..ec2da796ccd4ae0ca86d1d34572bab7b7d9c272e 100644 (file)
@@ -31,6 +31,7 @@
 #  include <utility>
 #  include <memory>
 
+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
 
index ce47fdda0ec437acfcee8fc1382d52c44b2e1df0..76c6c94bcd877a85162688d78f0c27d905eef4ec 100644 (file)
@@ -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 <deal.II/lac/sparse_matrix.h>
 #  include <deal.II/lac/trilinos_sparse_matrix.h>
 
+DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #  include <Ifpack.h>
 #  include <Ifpack_Chebyshev.h>
 #  include <Teuchos_ParameterList.hpp>
@@ -32,6 +33,7 @@
 #include <MueLu_EpetraOperator.hpp>
 #include <MueLu_MLParameterListInterpreter.hpp>
 #endif
+DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 DEAL_II_NAMESPACE_OPEN
 
index 6b5c05cf75a0c839badc53b748e0b8e7dbe6d1de..13bab016c2a08cdf2634d451135a990f661c9b22 100644 (file)
 #  include <deal.II/lac/dynamic_sparsity_pattern.h>
 #  include <deal.II/lac/sparsity_tools.h>
 
+DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #  include <Epetra_Export.h>
 #  include <ml_epetra_utils.h>
 #  include <ml_struct.h>
 #  include <Teuchos_RCP.hpp>
+DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 DEAL_II_NAMESPACE_OPEN
 
index 6c4913eabf2782c73f7aea7f8951c406c3adaa6c..247389a79600f23342ea1c8554b080da950989d3 100644 (file)
@@ -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 <deal.II/lac/sparsity_pattern.h>
 #  include <deal.II/lac/dynamic_sparsity_pattern.h>
 
+DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #  include <Epetra_Export.h>
+DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 DEAL_II_NAMESPACE_OPEN
 
index f09397c5433f9a2e96d99fe108955cc13fd2124c..eadd00c906e247a30a1f4c6c7a690a0322466017 100644 (file)
@@ -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.
 //
 
 #  include <deal.II/lac/trilinos_sparse_matrix.h>
 #  include <deal.II/lac/trilinos_block_vector.h>
+
+DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #  include <Epetra_Import.h>
 #  include <Epetra_Vector.h>
+DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 #  include <cmath>
 
index ad8356a833175f43fccd48d10e4e2638c01deb1d..552b534c498cb9ce1431c8ab6f7824da6b348cd1 100644 (file)
@@ -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.
 //
 #ifdef DEAL_II_WITH_TRILINOS
 
 #  include <cmath>
+
+DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
 #  include <Epetra_Import.h>
 #  include <Epetra_Export.h>
+DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
 
 
 DEAL_II_NAMESPACE_OPEN

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.