From: David Wells <wellsd2@rpi.edu>
Date: Fri, 4 May 2018 16:46:23 +0000 (-0400)
Subject: Revert "Mark a few file-specific variables as static."
X-Git-Tag: v9.0.0-rc1~20^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=74a8f79feb0cb513a4dd2d144aaecc77b12938eb;p=dealii.git

Revert "Mark a few file-specific variables as static."

This reverts commit 28611bfaf785b9459fc2c7259e31fb097496e24b.

tests.h adds is own extern declaration to access variables declared in
exceptions.cc, so they cannot be static.
---

diff --git a/source/base/exceptions.cc b/source/base/exceptions.cc
index ac83e72a92..4e3873f1d3 100644
--- a/source/base/exceptions.cc
+++ b/source/base/exceptions.cc
@@ -42,21 +42,21 @@ DEAL_II_NAMESPACE_OPEN
 namespace deal_II_exceptions
 {
 
-  static std::string additional_assert_output;
+  std::string additional_assert_output;
 
   void set_additional_assert_output (const char *const p)
   {
     additional_assert_output = p;
   }
 
-  static bool show_stacktrace = true;
+  bool show_stacktrace = true;
 
   void suppress_stacktrace_in_exceptions ()
   {
     show_stacktrace = false;
   }
 
-  static bool abort_on_exception = true;
+  bool abort_on_exception = true;
 
   void disable_abort_on_exception ()
   {
diff --git a/source/lac/constraint_matrix.cc b/source/lac/constraint_matrix.cc
index 5cd0e16dd6..e17c372269 100644
--- a/source/lac/constraint_matrix.cc
+++ b/source/lac/constraint_matrix.cc
@@ -1475,7 +1475,7 @@ ONLY_MATRIX_FUNCTIONS(PETScWrappers::MPI::BlockSparseMatrix);
 namespace internals
 {
 #define SCRATCH_INITIALIZER(MatrixScalar,VectorScalar,Name)                  \
-  static ConstraintMatrixData<MatrixScalar,VectorScalar>::ScratchData scratch_data_initializer_##Name; \
+  ConstraintMatrixData<MatrixScalar,VectorScalar>::ScratchData scratch_data_initializer_##Name; \
   template <> Threads::ThreadLocalStorage<ConstraintMatrixData<MatrixScalar,VectorScalar>::ScratchData> \
   ConstraintMatrixData<MatrixScalar,VectorScalar>::scratch_data(scratch_data_initializer_##Name)