summaryrefslogtreecommitdiff
path: root/ace/Message_Block_T.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'ace/Message_Block_T.cpp')
-rw-r--r--ace/Message_Block_T.cpp14
1 files changed, 8 insertions, 6 deletions
diff --git a/ace/Message_Block_T.cpp b/ace/Message_Block_T.cpp
index 70621872a19..d2cf9464ab0 100644
--- a/ace/Message_Block_T.cpp
+++ b/ace/Message_Block_T.cpp
@@ -1,9 +1,7 @@
// $Id$
-#if !defined (ACE_MESSAGE_BLOCK_T_C)
-#define ACE_MESSAGE_BLOCK_T_C
-
-ACE_RCSID(ace, Message_Block_T, "$Id$")
+#ifndef ACE_MESSAGE_BLOCK_T_CPP
+#define ACE_MESSAGE_BLOCK_T_CPP
#include "ace/Malloc_Base.h" /* Need ACE_Allocator */
@@ -13,6 +11,8 @@ ACE_RCSID(ace, Message_Block_T, "$Id$")
#include "ace/os_include/os_errno.h"
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
template<class L>
ACE_Locked_Data_Block<L>::~ACE_Locked_Data_Block (void)
{
@@ -28,7 +28,7 @@ ACE_Locked_Data_Block<ACE_LOCK>::clone_nocopy (ACE_Message_Block::Message_Flags
const ACE_Message_Block::Message_Flags always_clear =
ACE_Message_Block::DONT_DELETE;
- ACE_Locked_Data_Block<ACE_LOCK> *nb;
+ ACE_Locked_Data_Block<ACE_LOCK> *nb = 0;
ACE_NEW_MALLOC_RETURN (nb,
static_cast<ACE_Locked_Data_Block<ACE_LOCK>*> (
@@ -46,4 +46,6 @@ ACE_Locked_Data_Block<ACE_LOCK>::clone_nocopy (ACE_Message_Block::Message_Flags
return nb;
}
-#endif /* ACE_MESSAGE_BLOCK_T_C */
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* ACE_MESSAGE_BLOCK_T_CPP */