ChangeLogTag:Thu Apr 24 08:11:04 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>

5 files changed, 86 insertions, 5 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 6860f883b10..cd585836336 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,10 @@
+Thu Apr 24 08:11:04 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+
+	* tao/DynamicInterface/Context.h:
+	* tao/DynamicInterface/ExceptionList.h: Added a undef for
+	  TAO_EXPORT_MACRO and redefined TAO_EXPORT_MACRO. This should fix
+	  problems with MSVC builds.
+
 Wed Apr 23 22:12:37 2003  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
 	* tao/CDR_Encaps_Codec.cpp (encode_value):
diff --git a/TAO/tao/DynamicInterface/Context.h b/TAO/tao/DynamicInterface/Context.h
index dc3be4e7c35..2840f1441a7 100644
--- a/TAO/tao/DynamicInterface/Context.h
+++ b/TAO/tao/DynamicInterface/Context.h
@@ -31,6 +31,11 @@
 #include "ace/Atomic_Op.h"
 #include "ace/CORBA_macros.h"
 
+#if defined (TAO_EXPORT_MACRO)
+#undef TAO_EXPORT_MACRO
+#endif
+#define TAO_EXPORT_MACRO TAO_DynamicInterface_Export
+
 namespace CORBA
 {
   TAO_NAMESPACE_INLINE_FUNCTION void release (ContextList_ptr);
diff --git a/TAO/tao/DynamicInterface/ExceptionList.h b/TAO/tao/DynamicInterface/ExceptionList.h
index 6858ced253e..bbaa4fa4b79 100644
--- a/TAO/tao/DynamicInterface/ExceptionList.h
+++ b/TAO/tao/DynamicInterface/ExceptionList.h
@@ -21,11 +21,14 @@
 
 #ifndef TAO_CORBA_EXCEPTIONLIST_H
 #define TAO_CORBA_EXCEPTIONLIST_H
-
 #include "ace/pre.h"
 
 #include "dynamicinterface_export.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "tao/corbafwd.h"
 #include "tao/Pseudo_VarOut_T.h"
 
@@ -33,10 +36,10 @@
 #include "ace/Atomic_Op.h"
 #include "ace/CORBA_macros.h"
 
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
+#if defined (TAO_EXPORT_MACRO)
+#undef TAO_EXPORT_MACRO
+#endif
+#define TAO_EXPORT_MACRO TAO_DynamicInterface_Export
 
 namespace CORBA
 {
diff --git a/TAO/tao/DynamicInterface/Request.cpp b/TAO/tao/DynamicInterface/Request.cpp
index 1d9156707e8..b9830286fe2 100644
--- a/TAO/tao/DynamicInterface/Request.cpp
+++ b/TAO/tao/DynamicInterface/Request.cpp
@@ -462,3 +462,63 @@ CORBA::Request::handle_response (TAO_InputCDR &incoming,
   }
 }
 
+
+#if (TAO_HAS_MINIMUM_CORBA == 0)
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+  template class TAO_Pseudo_Var_T<CORBA::Request>;
+  template class TAO_Pseudo_Out_T<CORBA::Request, CORBA::Request_var>;
+  template class
+    TAO_Unbounded_Pseudo_Sequence<
+        CORBA::Request,
+        CORBA::Request_var
+      >;
+  template class
+    TAO_VarSeq_Var_T<
+        CORBA::ORB::RequestSeq,
+        TAO_Pseudo_Object_Manager<
+            CORBA::Request,
+            CORBA::Request_var
+          >
+      >;
+  template class
+    TAO_Seq_Out_T<
+        CORBA::ORB::RequestSeq,
+        CORBA::ORB::RequestSeq_var,
+        TAO_Pseudo_Object_Manager<
+            CORBA::Request,
+            CORBA::Request_var
+          >
+      >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate TAO_Pseudo_Var_T<CORBA::Request>
+# pragma instantiate TAO_Pseudo_Out_T<CORBA::Request, CORBA::Request_var>
+# pragma instantiate \
+    TAO_Unbounded_Pseudo_Sequence< \
+        CORBA::Request, \
+        CORBA::Request_var \
+      >
+# pragma instantiate \
+    TAO_VarSeq_Var_T< \
+        CORBA::ORB::RequestSeq, \
+        TAO_Pseudo_Object_Manager< \
+            CORBA::Request, \
+            CORBA::Request_var \
+          > \
+      >
+# pragma instantiate \
+    TAO_Seq_Out_T< \
+        CORBA::ORB::RequestSeq, \
+        CORBA::ORB::RequestSeq_var, \
+        TAO_Pseudo_Object_Manager< \
+            CORBA::Request, \
+            CORBA::Request_var \
+          > \
+      >
+
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+#endif /* TAO_HAS_MINIMUM_CORBA */
diff --git a/TAO/tao/DynamicInterface/Request.inl b/TAO/tao/DynamicInterface/Request.inl
index 090bb3c25bf..47bc3e2d9e3 100644
--- a/TAO/tao/DynamicInterface/Request.inl
+++ b/TAO/tao/DynamicInterface/Request.inl
@@ -13,6 +13,12 @@ CORBA::Request::_duplicate (CORBA::Request_ptr x)
   return x;
 }
 
+ACE_INLINE CORBA::Request_ptr
+CORBA::Request::_nil (void)
+{
+  return 0;
+}
+
 ACE_INLINE CORBA::Object_ptr
 CORBA::Request::target (void) const
 {