From: Wolfgang Bangerth Date: Fri, 4 Oct 2013 18:37:12 +0000 (+0000) Subject: Undo 31119 and fix it by doing the same thing in debug and release mode. X-Git-Tag: v8.1.0~570^2~111 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e610bf7c8e73647951a980e362c97eb3cd739360;p=dealii.git Undo 31119 and fix it by doing the same thing in debug and release mode. git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@31123 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/include/deal.II/grid/tria_objects.h b/deal.II/include/deal.II/grid/tria_objects.h index 1f3e6d0372..f43cc1d76a 100644 --- a/deal.II/include/deal.II/grid/tria_objects.h +++ b/deal.II/include/deal.II/grid/tria_objects.h @@ -771,11 +771,10 @@ namespace internal void *& TriaObjects::user_pointer (const unsigned int i) { -#ifdef DEBUG Assert(user_data_type == data_unknown || user_data_type == data_pointer, ExcPointerIndexClash()); user_data_type = data_pointer; -#endif + Assert(i::user_pointer (const unsigned int i) const { -#ifdef DEBUG Assert(user_data_type == data_unknown || user_data_type == data_pointer, ExcPointerIndexClash()); user_data_type = data_pointer; -#endif + Assert(i::user_index (const unsigned int i) { -#ifdef DEBUG Assert(user_data_type == data_unknown || user_data_type == data_index, ExcPointerIndexClash()); user_data_type = data_index; -#endif + Assert(i::user_index (const unsigned int i) const { -#ifdef DEBUG Assert(user_data_type == data_unknown || user_data_type == data_index, ExcPointerIndexClash()); user_data_type = data_index; -#endif + Assert(i