From 941b606b8fe725e865b0f3361903151395015485 Mon Sep 17 00:00:00 2001 From: nanbor Date: Mon, 13 Dec 1999 22:24:42 +0000 Subject: ChangeLogTag:Mon Dec 13 16:23:22 1999 Nanbor Wang --- ChangeLog-99b | 5 +++++ ace/Malloc.cpp | 4 ---- ace/Malloc.h | 4 ++-- tests/Malloc_Test.cpp | 2 -- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/ChangeLog-99b b/ChangeLog-99b index c2ef678e1bc..a8bd0bebcbb 100644 --- a/ChangeLog-99b +++ b/ChangeLog-99b @@ -1,3 +1,8 @@ +Mon Dec 13 16:23:22 1999 Nanbor Wang + + * ace/Malloc.{h,cpp}: Made print_alignment_info available for all + configuration. + Mon Dec 13 02:49:04 1999 Nanbor Wang * ace/Memory_Pool.cpp (remap): Commented out the printout of remap diff --git a/ace/Malloc.cpp b/ace/Malloc.cpp index d189539f2c7..cd813118646 100644 --- a/ace/Malloc.cpp +++ b/ace/Malloc.cpp @@ -34,7 +34,6 @@ ACE_Control_Block::ACE_Malloc_Header::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } -#if !defined (ACE_NDEBUG) void ACE_Control_Block::print_alignment_info (void) { @@ -68,7 +67,6 @@ ACE_Control_Block::print_alignment_info (void) )); ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("End <--- ACE_Control_Block::print_alignment_info:\n"))); } -#endif /* ACE_NDEBUG */ void ACE_Control_Block::dump (void) const @@ -169,7 +167,6 @@ ACE_PI_Control_Block::ACE_Malloc_Header::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } -#if !defined (ACE_NDEBUG) void ACE_PI_Control_Block::print_alignment_info (void) { @@ -203,7 +200,6 @@ ACE_PI_Control_Block::print_alignment_info (void) )); ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("End <--- ACE_PI_Control_Block::print_alignment_info:\n"))); } -#endif /* ACE_NDEBUG */ void ACE_PI_Control_Block::dump (void) const diff --git a/ace/Malloc.h b/ace/Malloc.h index 7cad547b3f9..0d45150f6e8 100644 --- a/ace/Malloc.h +++ b/ace/Malloc.h @@ -188,7 +188,7 @@ public: // Dump the state of the object. }; - ACE_DB (static void print_alignment_info (void);) + static void print_alignment_info (void); // Print out a bunch of size info for debugging. ACE_Name_Node *name_head_; @@ -352,7 +352,7 @@ public: ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Name_Node &)) }; - ACE_DB (static void print_alignment_info (void);) + static void print_alignment_info (void); // Print out a bunch of size info for debugging. NAME_NODE_PTR name_head_; diff --git a/tests/Malloc_Test.cpp b/tests/Malloc_Test.cpp index 1be48268cae..361f493a52e 100644 --- a/tests/Malloc_Test.cpp +++ b/tests/Malloc_Test.cpp @@ -272,12 +272,10 @@ main (int argc, ASYS_TCHAR *[]) init_test (PARENT_BASE_ADDR); -#if !defined (ACE_NDEBUG) ACE_Control_Block::print_alignment_info (); # if defined (ACE_HAS_POSITION_INDEPENDENT_MALLOC) ACE_PI_Control_Block::print_alignment_info (); # endif /* ACE_HAS_POSITION_INDEPENDENT_MALLOC */ -#endif /* ACE_NDEBUG */ // No arguments means we're the parent process. ACE_Process_Options options (1); -- cgit v1.2.1