From: bangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Tue, 14 Jan 2014 16:08:14 +0000 (+0000)
Subject: Avoid invalid cast from one to another DoFHandler type.
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=193aef217f630d0b9df141d8b9598e13e9c94bf6;p=dealii-svn.git

Avoid invalid cast from one to another DoFHandler type.


git-svn-id: https://svn.dealii.org/trunk@32204 0785d39b-7218-0410-832d-ea1e28bc413d
---

diff --git a/deal.II/include/deal.II/dofs/dof_accessor.templates.h b/deal.II/include/deal.II/dofs/dof_accessor.templates.h
index e3dc97f94b..327146e3f5 100644
--- a/deal.II/include/deal.II/dofs/dof_accessor.templates.h
+++ b/deal.II/include/deal.II/dofs/dof_accessor.templates.h
@@ -1,7 +1,7 @@
 // ---------------------------------------------------------------------
 // $Id$
 //
-// Copyright (C) 1999 - 2013 by the deal.II authors
+// Copyright (C) 1999 - 2014 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -77,7 +77,8 @@ template <int structdim, class DH, bool lda>
 template <int dim2, class DH2, bool lda2>
 inline
 DoFAccessor<structdim,DH,lda>::DoFAccessor (const DoFAccessor<dim2, DH2, lda2> &other)
-  : BaseClass(other), dof_handler(const_cast<DH *>(other.dof_handler))
+  : BaseClass(other),
+    dof_handler(0)
 {
   Assert (false, ExcInvalidObject());
 }
@@ -88,7 +89,8 @@ template <int structdim, class DH, bool lda>
 template <bool lda2>
 inline
 DoFAccessor<structdim,DH,lda>::DoFAccessor (const DoFAccessor<structdim, DH, lda2> &other)
-  : BaseClass(other), dof_handler(const_cast<DH *>(other.dof_handler))
+  : BaseClass(other),
+    dof_handler(const_cast<DH *>(other.dof_handler))
 {
 }