From 2c163f79688aa13115286d1823435ba7892c735e Mon Sep 17 00:00:00 2001
From: bangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Tue, 28 Apr 2009 20:42:33 +0000
Subject: [PATCH] Take patch 18772 from mainline: Get previous patch right.

git-svn-id: https://svn.dealii.org/branches/releases/Branch-6-2@18773 0785d39b-7218-0410-832d-ea1e28bc413d
---
 deal.II/aclocal.m4 | 36 +++++++++++++++++-------------------
 deal.II/configure  | 38 ++++++++++++++++++--------------------
 2 files changed, 35 insertions(+), 39 deletions(-)

diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4
index d83880452e..5cb9799ddf 100644
--- a/deal.II/aclocal.m4
+++ b/deal.II/aclocal.m4
@@ -4349,28 +4349,26 @@ AC_DEFUN(DEAL_II_CHECK_CTOR_DTOR_PRIVACY, dnl
     CXXFLAGS="-Wctor-dtor-privacy -Werror"
     AC_TRY_COMPILE(
       [
-      ],
-      [
-template <typename T>
-struct IsInt
-{
-  private:
-    struct yes_type { char c[1]; };
-    struct no_type  { char c[2]; };
-
-    template <typename T>
-    static yes_type check_for_int (const T *);
+        template <typename T>
+        struct IsInt
+        {
+          private:
+            struct yes_type { char c[1]; };
+            struct no_type  { char c[2]; };
 
-    static no_type check_for_int (...);
+            static yes_type check_for_int (const int *);
 
-  public:
-    static const bool value = (sizeof(check_for_block_matrix
-				      ((MatrixType*)0))
-			       ==
-			       sizeof(yes_type));
-};
+            static no_type check_for_int (...);
 
-const bool x = IsInt<double>::value;
+          public:
+            static const bool value = (sizeof(check_for_int((T*)0))
+        			       ==
+        			       sizeof(yes_type));
+        };
+        
+        const bool x = IsInt<double>::value;
+      ],
+      [
       ],
       [
         AC_MSG_RESULT(no)
diff --git a/deal.II/configure b/deal.II/configure
index 9e9c7e3a89..f3563cc071 100755
--- a/deal.II/configure
+++ b/deal.II/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 18740 .
+# From configure.in Revision: 18771 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for deal.II 6.2.0.
 #
@@ -8250,31 +8250,29 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
+        template <typename T>
+        struct IsInt
+        {
+          private:
+            struct yes_type { char c[1]; };
+            struct no_type  { char c[2]; };
 
-int
-main ()
-{
+            static yes_type check_for_int (const int *);
 
-template <typename T>
-struct IsInt
-{
-  private:
-    struct yes_type { char c[1]; };
-    struct no_type  { char c[2]; };
+            static no_type check_for_int (...);
 
-    template <typename T>
-    static yes_type check_for_int (const T *);
+          public:
+            static const bool value = (sizeof(check_for_int((T*)0))
+        			       ==
+        			       sizeof(yes_type));
+        };
 
-    static no_type check_for_int (...);
+        const bool x = IsInt<double>::value;
 
-  public:
-    static const bool value = (sizeof(check_for_block_matrix
-				      ((MatrixType*)0))
-			       ==
-			       sizeof(yes_type));
-};
+int
+main ()
+{
 
-const bool x = IsInt<double>::value;
 
   ;
   return 0;
-- 
2.39.5