summaryrefslogtreecommitdiff
path: root/TAO/tao/Messaging/Messaging.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tao/Messaging/Messaging.cpp')
-rw-r--r--TAO/tao/Messaging/Messaging.cpp13
1 files changed, 4 insertions, 9 deletions
diff --git a/TAO/tao/Messaging/Messaging.cpp b/TAO/tao/Messaging/Messaging.cpp
index 6f34e95f288..8b245a2ac34 100644
--- a/TAO/tao/Messaging/Messaging.cpp
+++ b/TAO/tao/Messaging/Messaging.cpp
@@ -1,8 +1,8 @@
// -*- C++ -*-
// $Id$
-#include "tao/Messaging/Messaging.h"
-#include "tao/Messaging/Messaging_Loader.h"
+#include "Messaging.h"
+#include "Messaging_Loader.h"
#include "tao/Exception_Data.h"
#include "tao/debug.h"
@@ -17,9 +17,6 @@ ACE_RCSID (Messaging,
Messaging,
"$Id$")
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
int
TAO_Messaging_Initializer::init (void)
{
@@ -88,7 +85,7 @@ exception_holder_raise (TAO::Exception_Data *exception_data,
if (ACE_OS::strcmp (type_id.in (), exception_data[i].id) != 0)
continue;
- CORBA::Exception * const exception = exception_data[i].alloc ();
+ CORBA::Exception *exception = exception_data[i].alloc ();
if (exception == 0)
ACE_THROW (CORBA::NO_MEMORY (TAO::VMCID,
@@ -98,7 +95,7 @@ exception_holder_raise (TAO::Exception_Data *exception_data,
// Raise the exception.
#if defined (TAO_HAS_EXCEPTIONS)
- ACE_Auto_Basic_Ptr<CORBA::Exception> e_ptr (exception);
+ ACE_Auto_Basic_Ptr<CORBA::Exception> e_ptr(exception);
#endif
ACE_ENV_RAISE (exception);
@@ -114,5 +111,3 @@ exception_holder_raise (TAO::Exception_Data *exception_data,
ACE_THROW (CORBA::UNKNOWN (TAO::VMCID,
CORBA::COMPLETED_YES));
}
-
-TAO_END_VERSIONED_NAMESPACE_DECL