summaryrefslogtreecommitdiff
path: root/TAO/tao/Messaging/AMH_Response_Handler.h
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tao/Messaging/AMH_Response_Handler.h')
-rw-r--r--TAO/tao/Messaging/AMH_Response_Handler.h22
1 files changed, 8 insertions, 14 deletions
diff --git a/TAO/tao/Messaging/AMH_Response_Handler.h b/TAO/tao/Messaging/AMH_Response_Handler.h
index 738afa35200..678aa406821 100644
--- a/TAO/tao/Messaging/AMH_Response_Handler.h
+++ b/TAO/tao/Messaging/AMH_Response_Handler.h
@@ -7,13 +7,14 @@
* $Id$
*
* @author Mayur Deshpande <mayur@ics.uci.edu>
+ *
*/
// =========================================================================
#ifndef TAO_AMH_RESPONSE_HANDLER_H
#define TAO_AMH_RESPONSE_HANDLER_H
-#include "tao/Messaging/messaging_export.h"
+#include "messaging_export.h"
#include "tao/Allocator.h"
#include "tao/Service_Context.h"
@@ -28,17 +29,12 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-class ACE_Allocator;
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
class TAO_Transport;
class TAO_Pluggable_Messaging;
class TAO_Output_CDR;
class TAO_ORB_Core;
class TAO_ServerRequest;
+class ACE_Allocator;
typedef ACE_Allocator TAO_AMH_BUFFER_ALLOCATOR;
@@ -69,7 +65,7 @@ class TAO_Messaging_Export TAO_AMH_Response_Handler
// isn't consistent with the specified semantics detailed in the
// CCM spec. Please remove this and place it where appropriate in
// your AMH tests and examples.
- : public TAO_Local_RefCounted_Object
+ : virtual public TAO_Local_RefCounted_Object
{
public:
@@ -86,8 +82,8 @@ public:
/**
* Stores necessary information from a TAO_Server_Request onto the heap
*/
- virtual void init (TAO_ServerRequest &server_request,
- TAO_AMH_BUFFER_ALLOCATOR* allocator);
+ virtual void init(TAO_ServerRequest &server_request,
+ TAO_AMH_BUFFER_ALLOCATOR* allocator);
/// @name Mutators for refcount
//@{
@@ -122,8 +118,8 @@ protected:
private:
// Private and undefined, standard C++ idiom to prohibit copying.
- TAO_AMH_Response_Handler (const TAO_AMH_Response_Handler&);
- TAO_AMH_Response_Handler& operator= (const TAO_AMH_Response_Handler&);
+ ACE_UNIMPLEMENTED_FUNC (TAO_AMH_Response_Handler (const TAO_AMH_Response_Handler&))
+ ACE_UNIMPLEMENTED_FUNC (TAO_AMH_Response_Handler& operator= (const TAO_AMH_Response_Handler&))
private:
/// Pointer to the original message-base
@@ -217,6 +213,4 @@ namespace TAO
}
-TAO_END_VERSIONED_NAMESPACE_DECL
-
#endif /* TAO_AMH_RESPONSE_HANDLER_H */