From 4776845655f81bf506b692b30d3f3b9b223fdb93 Mon Sep 17 00:00:00 2001 From: bangerth Date: Fri, 4 Oct 2013 18:37:12 +0000 Subject: [PATCH] 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 --- deal.II/include/deal.II/grid/tria_objects.h | 12 +++---- ...1.debug.output => triangulation_01.output} | 0 .../triangulation_01.release.output | 32 ------------------- 3 files changed, 4 insertions(+), 40 deletions(-) rename tests/serialization/{triangulation_01.debug.output => triangulation_01.output} (100%) delete mode 100644 tests/serialization/triangulation_01.release.output 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