Wed Feb 28 22:14:41 UTC 2007 Phil Mesnier <mesnier_p@ociweb.com>

4 files changed, 103 insertions, 8 deletions

diff --git a/TAO/ChangeLog.oci_rt9734 b/TAO/ChangeLog.oci_rt9734
index 233d3fb5385..8a68768d678 100644
--- a/TAO/ChangeLog.oci_rt9734
+++ b/TAO/ChangeLog.oci_rt9734
@@ -1,3 +1,11 @@
+Wed Feb 28 22:14:41 UTC 2007  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * orbsvcs/orbsvcs/AsynchProxyTools/AsyncProxyTools_Export.h:
+        * orbsvcs/orbsvcs/AsynchProxyTools/ProxyReplyHandler.h:
+        * orbsvcs/orbsvcs/AsynchProxyTools/ProxyServant.h:
+
+          Added library export macros.
+
 Thu Feb 22 22:01:13 UTC 2007  Wallace Zhang  <zhang_w@ociweb.com>
 
         * tests/DSI_AMI_Gateway/DSI_AMI_Gateway.mpc:
diff --git a/TAO/orbsvcs/orbsvcs/AsynchProxyTools/AsyncProxyTools_Export.h b/TAO/orbsvcs/orbsvcs/AsynchProxyTools/AsyncProxyTools_Export.h
new file mode 100644
index 00000000000..70925190dc4
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/AsynchProxyTools/AsyncProxyTools_Export.h
@@ -0,0 +1,58 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl TAO_AsynchProxyTools
+// ------------------------------
+#ifndef TAO_ASYNCHPROXYTOOLS_EXPORT_H
+#define TAO_ASYNCHPROXYTOOLS_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if defined (ACE_AS_STATIC_LIBS) && !defined (TAO_ASYNCHPROXYTOOLS_HAS_DLL)
+#  define TAO_ASYNCHPROXYTOOLS_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && TAO_ASYNCHPROXYTOOLS_HAS_DLL */
+
+#if !defined (TAO_ASYNCHPROXYTOOLS_HAS_DLL)
+#  define TAO_ASYNCHPROXYTOOLS_HAS_DLL 1
+#endif /* ! TAO_ASYNCHPROXYTOOLS_HAS_DLL */
+
+#if defined (TAO_ASYNCHPROXYTOOLS_HAS_DLL) && (TAO_ASYNCHPROXYTOOLS_HAS_DLL == 1)
+#  if defined (TAO_ASYNCHPROXYTOOLS_BUILD_DLL)
+#    define TAO_AsynchProxyTools_Export ACE_Proper_Export_Flag
+#    define TAO_ASYNCHPROXYTOOLS_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define TAO_ASYNCHPROXYTOOLS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* TAO_ASYNCHPROXYTOOLS_BUILD_DLL */
+#    define TAO_AsynchProxyTools_Export ACE_Proper_Import_Flag
+#    define TAO_ASYNCHPROXYTOOLS_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define TAO_ASYNCHPROXYTOOLS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* TAO_ASYNCHPROXYTOOLS_BUILD_DLL */
+#else /* TAO_ASYNCHPROXYTOOLS_HAS_DLL == 1 */
+#  define TAO_AsynchProxyTools_Export
+#  define TAO_ASYNCHPROXYTOOLS_SINGLETON_DECLARATION(T)
+#  define TAO_ASYNCHPROXYTOOLS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* TAO_ASYNCHPROXYTOOLS_HAS_DLL == 1 */
+
+// Set TAO_ASYNCHPROXYTOOLS_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (TAO_ASYNCHPROXYTOOLS_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define TAO_ASYNCHPROXYTOOLS_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define TAO_ASYNCHPROXYTOOLS_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !TAO_ASYNCHPROXYTOOLS_NTRACE */
+
+#if (TAO_ASYNCHPROXYTOOLS_NTRACE == 1)
+#  define TAO_ASYNCHPROXYTOOLS_TRACE(X)
+#else /* (TAO_ASYNCHPROXYTOOLS_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define TAO_ASYNCHPROXYTOOLS_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (TAO_ASYNCHPROXYTOOLS_NTRACE == 1) */
+
+#endif /* TAO_ASYNCHPROXYTOOLS_EXPORT_H */
+
+// End of auto generated file.
diff --git a/TAO/orbsvcs/orbsvcs/AsynchProxyTools/ProxyReplyHandler.h b/TAO/orbsvcs/orbsvcs/AsynchProxyTools/ProxyReplyHandler.h
index 782a9be2fdb..1609aab73ce 100644
--- a/TAO/orbsvcs/orbsvcs/AsynchProxyTools/ProxyReplyHandler.h
+++ b/TAO/orbsvcs/orbsvcs/AsynchProxyTools/ProxyReplyHandler.h
@@ -1,23 +1,36 @@
+// -*- C++ -*-
+
 //
 // $Id$
 //
+
+#ifndef TAO_PROXY_REPLY_HANDLER_H
+#define TAO_PROXY_REPLY_HANDLER_H
+
+#include "orbsvcs/AsynchProxyTools/AsynchProxyTools_Export.h"
+
+
 #include "tao/DynamicInterface/DII_Reply_Handler.h"
 #include "tao/DynamicInterface/Server_Request.h"
 #include "tao/DynamicInterface/AMH_DSI_Response_Handler.h"
 #include "tao/DynamicInterface/Dynamic_Implementation.h"
 #include "tao/DynamicInterface/Request.h"
-class ProxyReplyHandler : public virtual TAO_DII_Reply_Handler
-                        , public virtual Messaging::ReplyHandler
+
+class TAO_AsynchProxyTools_Export TAO_ProxyReplyHandler :
+  public virtual TAO_DII_Reply_Handler,
+  public virtual Messaging::ReplyHandler
 {
   public:
-    ProxyReplyHandler ();
-    virtual ~ProxyReplyHandler ();
+    TAO_ProxyReplyHandler ();
+    virtual ~TAO_ProxyReplyHandler ();
 
   // Callback method for deferred synchronous requests.
   virtual void handle_response (TAO_InputCDR &incoming);
   virtual void handle_excep (TAO_InputCDR &incoming,
                              CORBA::ULong reply_status);
 
-  virtual handle_response_i () = 0;
-  virtual handle_excep_i () = 0;
+  virtual void handle_response_i () = 0;
+  virtual void handle_excep_i () = 0;
 };
+
+#endif // TAO_PROXY_REPLY_HANDLER_H
diff --git a/TAO/orbsvcs/orbsvcs/AsynchProxyTools/ProxyServant.h b/TAO/orbsvcs/orbsvcs/AsynchProxyTools/ProxyServant.h
index e6e5f7db86b..15e25823960 100644
--- a/TAO/orbsvcs/orbsvcs/AsynchProxyTools/ProxyServant.h
+++ b/TAO/orbsvcs/orbsvcs/AsynchProxyTools/ProxyServant.h
@@ -1,11 +1,27 @@
+// -*- C++ -*-
+
 //
 //$Id$
 //
-class ProxyServant : public virtual TAO_DynamicImplementation
+
+#ifndef TAO_PROXY_SERVANT
+#define TAO_PROXY_SERVANT
+
+#include "tao/DynamicInterface/Dynamic_Implementation.h"
+#include "orbsvcs/AsynchProxyTools/AsynchProxyTools_Export.h"
+
+class TAO_AMH_DSI_Response_Handler;
+typedef TAO_AMH_DSI_Response_Handler * TAO_AMH_DSI_Response_Handler_ptr;
+
+class TAO_AsynchProxyTools_Export TAO_ProxyServant :
+  public virtual TAO_DynamicImplementation
 {
 public:
-  ProxyServant();
+  TAO_ProxyServant();
   void invoke (CORBA::ServerRequest_ptr request,
                TAO_AMH_DSI_Response_Handler_ptr rh);
   virtual void invoke_i () = 0;
 };
+
+
+#endif // TAO_PROXY_SERVANT