ChangeLogTag: Thu Sep 18 12:13:50 2003 Jeff Parsons <j.parsons@vanderbilt.edu>

16 files changed, 121 insertions, 37 deletions

diff --git a/TAO/ChangeLog_ref b/TAO/ChangeLog_ref
index 3605de66143..e39bd6289e0 100644
--- a/TAO/ChangeLog_ref
+++ b/TAO/ChangeLog_ref
@@ -1,3 +1,46 @@
+Thu Sep 18 12:13:50 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_arg_traits.cpp (visit_sequence):
+
+          Changed the generated #ifdef guard to use the flat name of
+          the sequence class, which is always unique.
+
+        * orbsvcs/orbsvcs/AV.dsp:
+        * orbsvcs/orbsvcs/CosNaming.dsp:
+        * orbsvcs/orbsvcs/CosProperty.dsp:
+        * orbsvcs/orbsvcs/CosTrading.dsp:
+        * orbsvcs/orbsvcs/Svc_Utils.dsp:
+        * tao/IORTable/TAO_IORTable.dsp:
+
+          Turned on RTTI.
+
+        * orbsvcs/orbsvcs/AV/sfp.h:
+
+          Removed unused #define.
+
+        * orbsvcs/orbsvcs/Naming/naming_export.h:
+
+          Added export declaration of TAO::Objref_Traits<> specialization for
+          CosNaming::NamingContext, so it can be seen by other libraries that
+          use it.
+
+        * tao/ClientRequestInfo.h:
+        * tao/ClientRequestInfo_i.cpp:
+        * tao/ClientRequestInfo_i.h:
+        * tao/ClientRequestInterceptor_Adapter.h:
+
+          Cleaned up file #includes.
+
+        * tao/Object.h:
+
+          Cosmetic changes.
+
+        * tao/IORTable/IORTableC.h:
+        * tao/PortableServer/PortableServerC.h:
+
+          Added export declaration of TAO::Objref_Traits<> specialization for
+          PortableServer::POAManager and IORTable::Table.
+
 Thu Sep 18 09:56:20 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
 	* tao/Abstract_Servant_Base.cpp:
diff --git a/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp b/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp
index 3b4ac9f596e..4819b44b29b 100644
--- a/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp
@@ -263,7 +263,7 @@ be_visitor_arg_traits::visit_sequence (be_sequence *node)
 
   // This will include the bound if there is one, and should also
   // prevent duplication, even if there have been further typdefs.
-  os->gen_ifdef_macro (node->gen_name (), "arg_traits");
+  os->gen_ifdef_macro (node->flat_name (), "arg_traits");
 
   *os << be_nl << be_nl
       << "ACE_TEMPLATE_SPECIALIZATION" << be_nl
diff --git a/TAO/orbsvcs/orbsvcs/AV.dsp b/TAO/orbsvcs/orbsvcs/AV.dsp
index 71112a0788a..0821b988639 100644
--- a/TAO/orbsvcs/orbsvcs/AV.dsp
+++ b/TAO/orbsvcs/orbsvcs/AV.dsp
@@ -45,7 +45,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "AV_EXPORTS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../../" /I "../../../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_AV_BUILD_DLL" /D "TAO_ORBSVCS_HAS_Trader" /FD /c

+# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../" /I "../../" /I "../../../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_AV_BUILD_DLL" /D "TAO_ORBSVCS_HAS_Trader" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

@@ -72,7 +72,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "AV_EXPORTS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_AV_BUILD_DLL" /D "TAO_ORBSVCS_HAS_Trader" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_AV_BUILD_DLL" /D "TAO_ORBSVCS_HAS_Trader" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

@@ -101,7 +101,7 @@ LINK32=link.exe
 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_AV_BUILD_DLL" /D "TAO_ORBSVCS_HAS_Trader" /FD /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_AV_BUILD_DLL" /D "TAO_ORBSVCS_HAS_Trader" /D ACE_HAS_MFC=1 /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_AV_BUILD_DLL" /D "TAO_ORBSVCS_HAS_Trader" /D ACE_HAS_MFC=1 /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

@@ -130,7 +130,7 @@ LINK32=link.exe
 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../../" /I "../../../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_AV_BUILD_DLL" /D "TAO_ORBSVCS_HAS_Trader" /FD /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../../" /I "../../../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_AV_BUILD_DLL" /D "TAO_ORBSVCS_HAS_Trader" /D ACE_HAS_MFC=1 /FD /c

+# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../" /I "../../" /I "../../../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_AV_BUILD_DLL" /D "TAO_ORBSVCS_HAS_Trader" /D ACE_HAS_MFC=1 /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

diff --git a/TAO/orbsvcs/orbsvcs/AV/sfp.h b/TAO/orbsvcs/orbsvcs/AV/sfp.h
index bc72e1cd06b..a038547eefc 100644
--- a/TAO/orbsvcs/orbsvcs/AV/sfp.h
+++ b/TAO/orbsvcs/orbsvcs/AV/sfp.h
@@ -31,7 +31,6 @@
 #define TAO_SFP_WRITEV_MAX 128
 
 #define TAO_SFP_MAX_PACKET_SIZE ACE_MAX_DGRAM_SIZE
-//#define TAO_SFP_MAX_PACKET_SIZE 132
 
 /**
  * @class TAO_SFP_Fragment_Node
diff --git a/TAO/orbsvcs/orbsvcs/CosNaming.dsp b/TAO/orbsvcs/orbsvcs/CosNaming.dsp
index 5abfbe91fb6..a217fae5af0 100644
--- a/TAO/orbsvcs/orbsvcs/CosNaming.dsp
+++ b/TAO/orbsvcs/orbsvcs/CosNaming.dsp
@@ -45,7 +45,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CosNaming_EXPORTS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../../" /I "../../../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "TAO_NAMING_BUILD_DLL" /FD /c

+# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../" /I "../../" /I "../../../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "TAO_NAMING_BUILD_DLL" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

@@ -72,7 +72,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CosNaming_EXPORTS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_NAMING_BUILD_DLL" /D "TAO_ORBSVCS_HAS_NAMING" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_NAMING_BUILD_DLL" /D "TAO_ORBSVCS_HAS_NAMING" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

@@ -102,7 +102,7 @@ LINK32=link.exe
 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../../" /I "../../../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "TAO_NAMING_BUILD_DLL" /FD /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../../" /I "../../../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "TAO_NAMING_BUILD_DLL" /D ACE_HAS_MFC=1 /FD /c

+# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../" /I "../../" /I "../../../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "TAO_NAMING_BUILD_DLL" /D ACE_HAS_MFC=1 /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

@@ -131,7 +131,7 @@ LINK32=link.exe
 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_NAMING_BUILD_DLL" /D "TAO_ORBSVCS_HAS_NAMING" /FD /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_NAMING_BUILD_DLL" /D "TAO_ORBSVCS_HAS_NAMING" /D ACE_HAS_MFC=1 /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_NAMING_BUILD_DLL" /D "TAO_ORBSVCS_HAS_NAMING" /D ACE_HAS_MFC=1 /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

diff --git a/TAO/orbsvcs/orbsvcs/CosProperty.dsp b/TAO/orbsvcs/orbsvcs/CosProperty.dsp
index 9c3a7a3875c..19d2c4f4b7e 100644
--- a/TAO/orbsvcs/orbsvcs/CosProperty.dsp
+++ b/TAO/orbsvcs/orbsvcs/CosProperty.dsp
@@ -45,7 +45,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CosProperty_EXPORTS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../../" /I "../../../" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_PROPERTY_BUILD_DLL" /FD /c

+# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../" /I "../../" /I "../../../" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_PROPERTY_BUILD_DLL" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

@@ -72,7 +72,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CosProperty_EXPORTS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D "_MBCS" /D "_USRDLL" /D "TAO_ORBSVCS_HAS_NAMING" /D "WIN32" /D "_WINDOWS" /D "TAO_PROPERTY_BUILD_DLL" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D "_MBCS" /D "_USRDLL" /D "TAO_ORBSVCS_HAS_NAMING" /D "WIN32" /D "_WINDOWS" /D "TAO_PROPERTY_BUILD_DLL" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

@@ -102,7 +102,7 @@ LINK32=link.exe
 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D "_MBCS" /D "_USRDLL" /D "TAO_ORBSVCS_HAS_NAMING" /D "WIN32" /D "_WINDOWS" /D "TAO_PROPERTY_BUILD_DLL" /FD /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D "_MBCS" /D "_USRDLL" /D "TAO_ORBSVCS_HAS_NAMING" /D "WIN32" /D "_WINDOWS" /D "TAO_PROPERTY_BUILD_DLL" /D ACE_HAS_MFC=1 /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D "_MBCS" /D "_USRDLL" /D "TAO_ORBSVCS_HAS_NAMING" /D "WIN32" /D "_WINDOWS" /D "TAO_PROPERTY_BUILD_DLL" /D ACE_HAS_MFC=1 /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

@@ -133,7 +133,7 @@ LINK32=link.exe
 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../../" /I "../../../" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_PROPERTY_BUILD_DLL" /FD /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../../" /I "../../../" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_PROPERTY_BUILD_DLL" /D ACE_HAS_MFC=1 /FD /c

+# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../" /I "../../" /I "../../../" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_PROPERTY_BUILD_DLL" /D ACE_HAS_MFC=1 /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

diff --git a/TAO/orbsvcs/orbsvcs/Naming/naming_export.h b/TAO/orbsvcs/orbsvcs/Naming/naming_export.h
index 3bc9c600e49..152bff689c0 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/naming_export.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/naming_export.h
@@ -35,6 +35,28 @@
 #  define TAO_NAMING_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
 #endif /* TAO_NAMING_HAS_DLL == 1 */
 
+// Export decl of Objref_Traits<> specialization needed by other libs.
+namespace CosNaming
+{
+  class NamingContext;
+  typedef NamingContext *NamingContext_ptr;
+}
+
+namespace TAO
+{
+  ACE_TEMPLATE_SPECIALIZATION
+  struct TAO_Naming_Export Objref_Traits<CosNaming::NamingContext>
+  {
+    static CosNaming::NamingContext_ptr tao_duplicate (
+        CosNaming::NamingContext_ptr
+      );
+    static void tao_release (CosNaming::NamingContext_ptr);
+    static CosNaming::NamingContext_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (CosNaming::NamingContext_ptr p,
+                                       TAO_OutputCDR & cdr);
+  };
+}
+
 #endif /* TAO_NAMING_EXPORT_H */
 
 // End of auto generated file.
diff --git a/TAO/orbsvcs/orbsvcs/Svc_Utils.dsp b/TAO/orbsvcs/orbsvcs/Svc_Utils.dsp
index 5151146820b..cdd61cb4864 100644
--- a/TAO/orbsvcs/orbsvcs/Svc_Utils.dsp
+++ b/TAO/orbsvcs/orbsvcs/Svc_Utils.dsp
@@ -45,7 +45,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_SVC_UTILS_EXPORTS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GR- /GX /O2 /I "../" /I "../../" /I "../../../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_SVC_UTILS_BUILD_DLL" /D "TAO_ORBSVCS_HAS_SVC_UTILS" /FD /c

+# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../" /I "../../" /I "../../../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_SVC_UTILS_BUILD_DLL" /D "TAO_ORBSVCS_HAS_SVC_UTILS" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

@@ -72,7 +72,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_SVC_UTILS_EXPORTS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_SVC_UTILS_BUILD_DLL" /D "TAO_ORBSVCS_HAS_SVC_UTILS" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_SVC_UTILS_BUILD_DLL" /D "TAO_ORBSVCS_HAS_SVC_UTILS" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

@@ -101,7 +101,7 @@ LINK32=link.exe
 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../../" /I "../../../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_SVC_UTILS_BUILD_DLL" /D "TAO_ORBSVCS_HAS_SVC_UTILS" /FD /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MD /W3 /GR- /GX /O2 /I "../" /I "../../" /I "../../../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_SVC_UTILS_BUILD_DLL" /D "TAO_ORBSVCS_HAS_SVC_UTILS" /D ACE_HAS_MFC=1 /FD /c

+# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../" /I "../../" /I "../../../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_SVC_UTILS_BUILD_DLL" /D "TAO_ORBSVCS_HAS_SVC_UTILS" /D ACE_HAS_MFC=1 /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

@@ -130,7 +130,7 @@ LINK32=link.exe
 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_SVC_UTILS_BUILD_DLL" /D "TAO_ORBSVCS_HAS_SVC_UTILS" /FD /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_SVC_UTILS_BUILD_DLL" /D "TAO_ORBSVCS_HAS_SVC_UTILS" /D ACE_HAS_MFC=1 /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_SVC_UTILS_BUILD_DLL" /D "TAO_ORBSVCS_HAS_SVC_UTILS" /D ACE_HAS_MFC=1 /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

diff --git a/TAO/tao/ClientRequestInfo.h b/TAO/tao/ClientRequestInfo.h
index 423b50d77db..11ab404be29 100644
--- a/TAO/tao/ClientRequestInfo.h
+++ b/TAO/tao/ClientRequestInfo.h
@@ -18,7 +18,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/orbconf.h"
+#include "tao/LocalObject.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -34,7 +34,6 @@
 #endif /* _MSC_VER */
 
 #include "tao/PortableInterceptorC.h"
-#include "tao/LocalObject.h"
 
 class TAO_ClientRequestInfo_i;
 
diff --git a/TAO/tao/ClientRequestInfo_i.cpp b/TAO/tao/ClientRequestInfo_i.cpp
index 367f1976d9f..5081954bf71 100644
--- a/TAO/tao/ClientRequestInfo_i.cpp
+++ b/TAO/tao/ClientRequestInfo_i.cpp
@@ -1,16 +1,13 @@
 #include "ClientRequestInfo_i.h"
 
-#if TAO_HAS_INTERCEPTORS == 1
+#if (TAO_HAS_INTERCEPTORS == 1)
 
 #include "Invocation_Base.h"
 #include "Stub.h"
 #include "ORB_Core.h"
 #include "Profile.h"
-#include "Tagged_Components.h"
-#include "Valuetype_Adapter.h"
 #include "debug.h"
 #include "Service_Context.h"
-#include "ace/Dynamic_Service.h"
 
 # if !defined (__ACE_INLINE__)
 #   include "ClientRequestInfo_i.inl"
@@ -20,8 +17,6 @@ ACE_RCSID (TAO,
            ClientRequestInfo_i,
            "$Id$")
 
-
-
   TAO_ClientRequestInfo_i::TAO_ClientRequestInfo_i (TAO::Invocation_Base *inv)
   : invocation_ (inv),
     abstract_target_ (0),
@@ -35,7 +30,8 @@ ACE_RCSID (TAO,
 TAO_ClientRequestInfo_i::TAO_ClientRequestInfo_i (
     TAO::Invocation_Base *inv,
     CORBA::AbstractBase_ptr abstract_target,
-    CORBA::Boolean )
+    CORBA::Boolean
+  )
   : invocation_ (inv),
     abstract_target_ (abstract_target), // No need to duplicate.
     caught_exception_ (0),
diff --git a/TAO/tao/ClientRequestInfo_i.h b/TAO/tao/ClientRequestInfo_i.h
index 4f3d5fa20a2..c28a2330a9e 100644
--- a/TAO/tao/ClientRequestInfo_i.h
+++ b/TAO/tao/ClientRequestInfo_i.h
@@ -26,9 +26,8 @@
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
-#include "tao/PortableInterceptorC.h"
-#include "tao/PICurrent.h"
 #include "tao/Invocation_Utils.h"
+#include "tao/PICurrent.h"
 
 class TAO_Service_Context;
 
diff --git a/TAO/tao/ClientRequestInterceptor_Adapter.h b/TAO/tao/ClientRequestInterceptor_Adapter.h
index 8d50691af8e..b5d8de81a31 100644
--- a/TAO/tao/ClientRequestInterceptor_Adapter.h
+++ b/TAO/tao/ClientRequestInterceptor_Adapter.h
@@ -55,7 +55,8 @@ namespace TAO
 
     ClientRequestInterceptor_Adapter (
         TAO_ClientRequestInterceptor_List::TYPE & interceptors,
-        Invocation_Base *invocation);
+        Invocation_Base *invocation
+      );
 
     ~ClientRequestInterceptor_Adapter (void);
 
diff --git a/TAO/tao/IORTable/IORTableC.h b/TAO/tao/IORTable/IORTableC.h
index 7f09a894cd1..c2dae44146f 100644
--- a/TAO/tao/IORTable/IORTableC.h
+++ b/TAO/tao/IORTable/IORTableC.h
@@ -378,6 +378,16 @@ namespace IORTable
 // Traits specializations.
 namespace TAO
 {
+  // Hand crafted.
+  ACE_TEMPLATE_SPECIALIZATION
+  struct TAO_IORTable_Export Objref_Traits<IORTable::Table>
+  {
+    static IORTable::Table_ptr tao_duplicate (IORTable::Table_ptr);
+    static void tao_release (IORTable::Table_ptr);
+    static IORTable::Table_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (IORTable::Table_ptr p,
+                                       TAO_OutputCDR & cdr);
+  };
 };
 
 // TAO_IDL - Generated from
diff --git a/TAO/tao/IORTable/TAO_IORTable.dsp b/TAO/tao/IORTable/TAO_IORTable.dsp
index 660117c83a5..4bdcd0d34bf 100644
--- a/TAO/tao/IORTable/TAO_IORTable.dsp
+++ b/TAO/tao/IORTable/TAO_IORTable.dsp
@@ -45,7 +45,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "IORTable_EXPORTS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "../" /I "../../" /I "../../../" /D "NDEBUG" /D "TAO_IORTABLE_BUILD_DLL" /D "WIN32" /D "_WINDOWS" /FD /c

+# ADD CPP /nologo /MD /W3 /GR /GX /Zi /O2 /I "../" /I "../../" /I "../../../" /D "NDEBUG" /D "TAO_IORTABLE_BUILD_DLL" /D "WIN32" /D "_WINDOWS" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

@@ -72,7 +72,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "IORTable_EXPORTS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D "TAO_IORTABLE_BUILD_DLL" /D "WIN32" /D "_WINDOWS" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D "TAO_IORTABLE_BUILD_DLL" /D "WIN32" /D "_WINDOWS" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

@@ -101,7 +101,7 @@ LINK32=link.exe
 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_EVENT_BUILD_DLL" /FD /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D ACE_HAS_MFC=1 /D "TAO_IORTABLE_BUILD_DLL" /D "WIN32" /D "_WINDOWS" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D ACE_HAS_MFC=1 /D "TAO_IORTABLE_BUILD_DLL" /D "WIN32" /D "_WINDOWS" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

@@ -130,7 +130,7 @@ LINK32=link.exe
 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../../" /I "../../../" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_EVENT_BUILD_DLL" /FD /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "../" /I "../../" /I "../../../" /D "NDEBUG" /D ACE_HAS_MFC=1 /D "TAO_IORTABLE_BUILD_DLL" /D "WIN32" /D "_WINDOWS" /FD /c

+# ADD CPP /nologo /MD /W3 /GR /GX /Zi /O2 /I "../" /I "../../" /I "../../../" /D "NDEBUG" /D ACE_HAS_MFC=1 /D "TAO_IORTABLE_BUILD_DLL" /D "WIN32" /D "_WINDOWS" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

diff --git a/TAO/tao/Object.h b/TAO/tao/Object.h
index 4187c4eed1e..0adf46b88fc 100644
--- a/TAO/tao/Object.h
+++ b/TAO/tao/Object.h
@@ -402,7 +402,8 @@ namespace TAO
    *  don't have an Any insertion operator for Object.
    */
   ACE_TEMPLATE_SPECIALIZATION
-  class Ret_Object_Argument_T <CORBA::Object_ptr, CORBA::Object_var> : public Argument
+  class TAO_Export Ret_Object_Argument_T <CORBA::Object_ptr, CORBA::Object_var>
+    : public Argument
   {
   public:
     Ret_Object_Argument_T (void);
@@ -424,8 +425,10 @@ namespace TAO
 
 /// This function pointer is set only when the Portable server
 /// library is present.
-extern TAO_Export TAO::Object_Proxy_Broker * (*_TAO_Object_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
+extern 
+  TAO_Export TAO::Object_Proxy_Broker * 
+  (*_TAO_Object_Proxy_Broker_Factory_function_pointer) (
+      CORBA::Object_ptr obj
     );
 
 TAO_Export CORBA::Boolean
diff --git a/TAO/tao/PortableServer/PortableServerC.h b/TAO/tao/PortableServer/PortableServerC.h
index 47657091c68..ffe687bfd58 100644
--- a/TAO/tao/PortableServer/PortableServerC.h
+++ b/TAO/tao/PortableServer/PortableServerC.h
@@ -2907,6 +2907,18 @@ namespace PortableServer
 // Traits specializations.
 namespace TAO
 {
+  // Hand crafted.
+  ACE_TEMPLATE_SPECIALIZATION
+  struct TAO_PortableServer_Export Objref_Traits<PortableServer::POAManager>
+  {
+    static PortableServer::POAManager_ptr tao_duplicate (
+        PortableServer::POAManager_ptr
+      );
+    static void tao_release (PortableServer::POAManager_ptr);
+    static PortableServer::POAManager_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (PortableServer::POAManager_ptr p,
+                                       TAO_OutputCDR & cdr);
+  };
 };
 
 // TAO_IDL - Generated from