*** empty log message ***

7 files changed, 32 insertions, 26 deletions

diff --git a/TAO/tao/PortableServer/Any_SArg_Traits.h b/TAO/tao/PortableServer/Any_SArg_Traits.h
index 04c5c9ac9bc..d73a10d85bb 100644
--- a/TAO/tao/PortableServer/Any_SArg_Traits.h
+++ b/TAO/tao/PortableServer/Any_SArg_Traits.h
@@ -21,9 +21,10 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/Arg_Traits_T.h"
 #include "tao/PortableServer/Var_Size_SArgument_T.h"
-#include "tao/portableserver_export.h"
+#include "tao/PortableServer/portableserver_export.h"
+
+#include "tao/Arg_Traits_T.h"
 
 namespace CORBA
 {
diff --git a/TAO/tao/PortableServer/Basic_SArguments.h b/TAO/tao/PortableServer/Basic_SArguments.h
index 69962fdf9a9..a61a5dc68b6 100644
--- a/TAO/tao/PortableServer/Basic_SArguments.h
+++ b/TAO/tao/PortableServer/Basic_SArguments.h
@@ -16,12 +16,13 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/Basic_SArgument_T.h"
+#include "tao/PortableServer/portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/PortableServer/Basic_SArgument_T.h"
 #include "tao/Arg_Traits_T.h"
 
 
@@ -33,7 +34,7 @@ namespace TAO
    *
    */
   template<>
-  class TAO_Export SArg_Traits<void>
+  class TAO_PortableServer_Export SArg_Traits<void>
   {
   public:
 
@@ -50,55 +51,55 @@ namespace TAO
    */
 
   template<>
-  class TAO_Export SArg_Traits<CORBA::Short>
+  class TAO_PortableServer_Export SArg_Traits<CORBA::Short>
     : public Basic_SArg_Traits_T<CORBA::Short>
   {
   };
 
   template<>
-  class TAO_Export SArg_Traits<CORBA::Long>
+  class TAO_PortableServer_Export SArg_Traits<CORBA::Long>
     : public Basic_SArg_Traits_T<CORBA::Long>
   {
   };
 
   template<>
-  class TAO_Export SArg_Traits<CORBA::UShort>
+  class TAO_PortableServer_Export SArg_Traits<CORBA::UShort>
     : public Basic_SArg_Traits_T<CORBA::UShort>
   {
   };
 
   template<>
-  class TAO_Export SArg_Traits<CORBA::ULong>
+  class TAO_PortableServer_Export SArg_Traits<CORBA::ULong>
     : public Basic_SArg_Traits_T<CORBA::ULong>
   {
   };
 
   template<>
-  class TAO_Export SArg_Traits<CORBA::Float>
+  class TAO_PortableServer_Export SArg_Traits<CORBA::Float>
     : public Basic_SArg_Traits_T<CORBA::Float>
   {
   };
 
   template<>
-  class TAO_Export SArg_Traits<CORBA::Double>
+  class TAO_PortableServer_Export SArg_Traits<CORBA::Double>
     : public Basic_SArg_Traits_T<CORBA::Double>
   {
   };
 
   template<>
-  class TAO_Export SArg_Traits<CORBA::LongLong>
+  class TAO_PortableServer_Export SArg_Traits<CORBA::LongLong>
     : public Basic_SArg_Traits_T<CORBA::LongLong>
   {
   };
 
   template<>
-  class TAO_Export SArg_Traits<CORBA::ULongLong>
+  class TAO_PortableServer_Export SArg_Traits<CORBA::ULongLong>
     : public Basic_SArg_Traits_T<CORBA::ULongLong>
   {
   };
 
   template<>
-  class TAO_Export SArg_Traits<CORBA::LongDouble>
+  class TAO_PortableServer_Export SArg_Traits<CORBA::LongDouble>
     : public Basic_SArg_Traits_T<CORBA::LongDouble>
   {
   };
diff --git a/TAO/tao/PortableServer/Object_SArg_Traits.h b/TAO/tao/PortableServer/Object_SArg_Traits.h
index 4e22b823a9c..e8f9530e739 100644
--- a/TAO/tao/PortableServer/Object_SArg_Traits.h
+++ b/TAO/tao/PortableServer/Object_SArg_Traits.h
@@ -43,7 +43,7 @@ namespace TAO
   /// Used in generated code if CORBA::Object is an argument or
   /// return type.
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_Export SArg_Traits<CORBA::Object>
+  class TAO_PortableServer_Export SArg_Traits<CORBA::Object>
     : public Object_SArg_Traits_T<CORBA::Object_ptr,
                                   CORBA::Object_var,
                                   CORBA::Object_out>
diff --git a/TAO/tao/PortableServer/Servant_Base.cpp b/TAO/tao/PortableServer/Servant_Base.cpp
index 673c8efd4d1..cb22d01f97f 100644
--- a/TAO/tao/PortableServer/Servant_Base.cpp
+++ b/TAO/tao/PortableServer/Servant_Base.cpp
@@ -188,8 +188,9 @@ TAO_ServantBase::_create_stub (ACE_ENV_SINGLE_ARG_DECL)
   return stub;
 }
 
-void TAO_ServantBase::synchronous_upcall_dispatch (TAO_ServerRequest &req,
-                                                   void *servant_upcall
+void TAO_ServantBase::synchronous_upcall_dispatch (TAO_ServerRequest & req,
+                                                   void * servant_upcall,
+                                                   void * derived_this
                                                    ACE_ENV_ARG_DECL)
 {
   TAO_Skeleton skel;
@@ -223,7 +224,8 @@ void TAO_ServantBase::synchronous_upcall_dispatch (TAO_ServerRequest &req,
       // results.  De/marshaling will only occur in the uncollocated
       // case.
       skel (req,
-            servant_upcall
+            servant_upcall,
+            derived_this
             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
diff --git a/TAO/tao/PortableServer/Special_Basic_SArguments.h b/TAO/tao/PortableServer/Special_Basic_SArguments.h
index 647ee83b8a6..b334c347597 100644
--- a/TAO/tao/PortableServer/Special_Basic_SArguments.h
+++ b/TAO/tao/PortableServer/Special_Basic_SArguments.h
@@ -16,12 +16,13 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/Special_Basic_SArgument_T.h"
+#include "tao/PortableServer/portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/PortableServer/Special_Basic_SArgument_T.h"
 #include "tao/Arg_Traits_T.h"
 
 #include "ace/CDR_Stream.h"
@@ -36,7 +37,7 @@ namespace TAO
    */
 
   template<>
-  class TAO_Export SArg_Traits<ACE_InputCDR::to_char>
+  class TAO_PortableServer_Export SArg_Traits<ACE_InputCDR::to_char>
     : public Special_Basic_SArg_Traits_T<CORBA::Char,
                                          ACE_InputCDR::to_char,
                                          ACE_OutputCDR::from_char>
@@ -44,7 +45,7 @@ namespace TAO
   };
 
   template<>
-  class TAO_Export SArg_Traits<ACE_InputCDR::to_wchar>
+  class TAO_PortableServer_Export SArg_Traits<ACE_InputCDR::to_wchar>
     : public Special_Basic_SArg_Traits_T<CORBA::WChar,
                                          ACE_InputCDR::to_wchar,
                                          ACE_OutputCDR::from_wchar>
@@ -52,7 +53,7 @@ namespace TAO
   };
 
   template<>
-  class TAO_Export SArg_Traits<ACE_InputCDR::to_octet>
+  class TAO_PortableServer_Export SArg_Traits<ACE_InputCDR::to_octet>
     : public Special_Basic_SArg_Traits_T<CORBA::Octet,
                                          ACE_InputCDR::to_octet,
                                          ACE_OutputCDR::from_octet>
@@ -60,7 +61,7 @@ namespace TAO
   };
 
   template<>
-  class TAO_Export SArg_Traits<ACE_InputCDR::to_boolean>
+  class TAO_PortableServer_Export SArg_Traits<ACE_InputCDR::to_boolean>
     : public Special_Basic_SArg_Traits_T<CORBA::Boolean,
                                          ACE_InputCDR::to_boolean,
                                          ACE_OutputCDR::from_boolean>
diff --git a/TAO/tao/PortableServer/TypeCode_SArg_Traits.h b/TAO/tao/PortableServer/TypeCode_SArg_Traits.h
index d4bbd7498ad..5a40a393b43 100644
--- a/TAO/tao/PortableServer/TypeCode_SArg_Traits.h
+++ b/TAO/tao/PortableServer/TypeCode_SArg_Traits.h
@@ -43,7 +43,7 @@ namespace TAO
   /// Used in generated code if CORBA::TypeCode is an argument or
   /// return type.
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_Export SArg_Traits<CORBA::TypeCode>
+  class TAO_PortableServer_Export SArg_Traits<CORBA::TypeCode>
     : public Object_SArg_Traits_T<CORBA::TypeCode_ptr,
                                   CORBA::TypeCode_var,
                                   CORBA::TypeCode_out>
diff --git a/TAO/tao/PortableServer/UB_String_SArguments.h b/TAO/tao/PortableServer/UB_String_SArguments.h
index d4a3a0bf768..d70ebf0e941 100644
--- a/TAO/tao/PortableServer/UB_String_SArguments.h
+++ b/TAO/tao/PortableServer/UB_String_SArguments.h
@@ -15,12 +15,13 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/UB_String_SArgument_T.h"
+#include "tao/PortableServer/portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/PortableServer/UB_String_SArgument_T.h"
 #include "tao/Arg_Traits_T.h"
 
 namespace TAO
@@ -32,7 +33,7 @@ namespace TAO
    */
 
   template<>
-  class TAO_Export SArg_Traits<CORBA::Char *>
+  class TAO_PortableServer_Export SArg_Traits<CORBA::Char *>
     : public UB_String_SArg_Traits_T<CORBA::Char,
                                      CORBA::String_var,
                                      CORBA::String_out>
@@ -40,7 +41,7 @@ namespace TAO
   };
 
   template<>
-  class TAO_Export SArg_Traits<CORBA::WChar *>
+  class TAO_PortableServer_Export SArg_Traits<CORBA::WChar *>
     : public UB_String_SArg_Traits_T<CORBA::WChar,
                                      CORBA::WString_var,
                                      CORBA::WString_out>