From: Nicolas Barnafi <nabw91@gmail.com>
Date: Fri, 16 Sep 2022 09:08:03 +0000 (+0200)
Subject: Merge with master
X-Git-Tag: v9.5.0-rc1~947^2~1
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=65d7c2e4f5643172e047334ab202af06a75325f2;p=dealii.git

Merge with master
---

65d7c2e4f5643172e047334ab202af06a75325f2
diff --cc include/deal.II/lac/petsc_precondition.h
index a4fa95a2ec,e4bf24814f..5304d0b0ec
--- a/include/deal.II/lac/petsc_precondition.h
+++ b/include/deal.II/lac/petsc_precondition.h
@@@ -14,19 -14,18 +14,19 @@@
  // ---------------------------------------------------------------------
  
  #ifndef dealii_petsc_precondition_h
- #  define dealii_petsc_precondition_h
+ #define dealii_petsc_precondition_h
  
  
- #  include <deal.II/base/config.h>
+ #include <deal.II/base/config.h>
  
- #  include <deal.II/base/point.h>
- #  include <deal.II/base/subscriptor.h>
++#include <deal.II/base/point.h>
+ #include <deal.II/base/subscriptor.h>
  
- #  ifdef DEAL_II_WITH_PETSC
+ #ifdef DEAL_II_WITH_PETSC
  
- #    include <deal.II/lac/exceptions.h>
+ #  include <deal.II/lac/exceptions.h>
  
- #    include <petscpc.h>
+ #  include <petscpc.h>
  
  DEAL_II_NAMESPACE_OPEN
  
diff --cc include/deal.II/lac/petsc_sparse_matrix.h
index 473eaf4bf2,d4640f4a75..08d7734571
--- a/include/deal.II/lac/petsc_sparse_matrix.h
+++ b/include/deal.II/lac/petsc_sparse_matrix.h
@@@ -14,21 -14,18 +14,21 @@@
  // ---------------------------------------------------------------------
  
  #ifndef dealii_petsc_sparse_matrix_h
- #  define dealii_petsc_sparse_matrix_h
+ #define dealii_petsc_sparse_matrix_h
  
  
- #  include <deal.II/base/config.h>
+ #include <deal.II/base/config.h>
  
- #  ifdef DEAL_II_WITH_PETSC
+ #ifdef DEAL_II_WITH_PETSC
  
- #    include <deal.II/lac/exceptions.h>
- #    include <deal.II/lac/petsc_matrix_base.h>
- #    include <deal.II/lac/petsc_vector.h>
+ #  include <deal.II/lac/exceptions.h>
+ #  include <deal.II/lac/petsc_matrix_base.h>
+ #  include <deal.II/lac/petsc_vector.h>
  
- #    include <petscis.h>
- #    include <petscistypes.h>
++#  include <petscis.h>
++#  include <petscistypes.h>
 +
- #    include <vector>
+ #  include <vector>
  
  DEAL_II_NAMESPACE_OPEN
  // forward declaration