ChangeLogTag:Sun Sep 28 11:13:07 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>

24 files changed, 44 insertions, 299 deletions

diff --git a/TAO/ChangeLog_ref b/TAO/ChangeLog_ref
index d2c4ce000a0..37eebbf5233 100644
--- a/TAO/ChangeLog_ref
+++ b/TAO/ChangeLog_ref
@@ -1,3 +1,35 @@
+Sun Sep 28 11:13:07 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+
+	* tao/PortableInterceptorC.cpp:
+	* tao/PortableInterceptorC.h:
+	* tao/DynamicAny/DynamicAnyC.cpp:
+	* tao/DynamicAny/DynamicAnyC.h:
+	* tao/IORInterceptor/IORInterceptorC.cpp:
+	* tao/IORInterceptor/IORInterceptorC.h:
+	* tao/IORManipulation/IORC.cpp: 
+	* tao/IORManipulation/IORC.h:
+	* tao/IORTable/IORTableC.cpp:
+	* tao/IORTable/IORTableC.h:
+	* tao/PortableServer/ImR_LocatorC.cpp:
+	* tao/PortableServer/ImR_LocatorC.h:
+	* tao/PortableServer/ImplRepoC.cpp:
+	* tao/PortableServer/ImplRepoC.h:
+	* tao/PortableServer/PortableServerC.cpp:
+	* tao/PortableServer/PortableServerC.h:
+	* tao/RTCORBA/RTCORBAC.cpp:
+	* tao/RTCORBA/RTCORBAC.h:
+	* tao/RTPortableServer/RTPortableServerC.cpp:
+	* tao/RTPortableServer/RTPortableServerC.h:
+	* tao/RTScheduling/RTSchedulerC.cpp:
+	* tao/RTScheduling/RTSchedulerC.h:
+	  All these files needed the template specializations for
+	  Objref_Traits which were previously available only for
+	  Win32. Win32 was good and it gave compile errors. But 
+	  with g++ we got link errors. 
+
+	* tao/Strategies/UIOP_Acceptor.h: Needed an include of
+	  orbconf.h. Else the cpp file was compiled out of the library. 
+
 Sun Sep 28 11:09:35 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
 	* tests/AMI_Buffering/Client_Task.h:
diff --git a/TAO/tao/DynamicAny/DynamicAnyC.cpp b/TAO/tao/DynamicAny/DynamicAnyC.cpp
index bcab861014c..bb216b16ca2 100644
--- a/TAO/tao/DynamicAny/DynamicAnyC.cpp
+++ b/TAO/tao/DynamicAny/DynamicAnyC.cpp
@@ -168,8 +168,6 @@ namespace TAO
 // TAO_IDL - Generated from
 // be/be_visitor_interface/interface_cs.cpp:60
 
-#if defined (_MSC_VER)
-
 // Traits specializations for DynamicAny::DynAny.
 
 DynamicAny::DynAny_ptr
@@ -203,8 +201,6 @@ TAO::Objref_Traits<DynamicAny::DynAny>::tao_marshal (
   return p->marshal (cdr);
 }
 
-#endif /* _MSC_VER */
-
 // Function pointer for collocation factory initialization.
 TAO::Collocation_Proxy_Broker *
 (*DynamicAny__TAO_DynAny_Proxy_Broker_Factory_function_pointer) (
@@ -458,8 +454,6 @@ DynamicAny::DynAny::marshal (TAO_OutputCDR &)
 // TAO_IDL - Generated from
 // be/be_visitor_interface/interface_cs.cpp:60
 
-#if defined (_MSC_VER)
-
 // Traits specializations for DynamicAny::DynFixed.
 
 DynamicAny::DynFixed_ptr
@@ -493,8 +487,6 @@ TAO::Objref_Traits<DynamicAny::DynFixed>::tao_marshal (
   return p->marshal (cdr);
 }
 
-#endif /* _MSC_VER */
-
 // Function pointer for collocation factory initialization.
 TAO::Collocation_Proxy_Broker *
 (*DynamicAny__TAO_DynFixed_Proxy_Broker_Factory_function_pointer) (
@@ -582,8 +574,6 @@ DynamicAny::DynFixed::marshal (TAO_OutputCDR &)
 // TAO_IDL - Generated from
 // be/be_visitor_interface/interface_cs.cpp:60
 
-#if defined (_MSC_VER)
-
 // Traits specializations for DynamicAny::DynEnum.
 
 DynamicAny::DynEnum_ptr
@@ -617,8 +607,6 @@ TAO::Objref_Traits<DynamicAny::DynEnum>::tao_marshal (
   return p->marshal (cdr);
 }
 
-#endif /* _MSC_VER */
-
 // Function pointer for collocation factory initialization.
 TAO::Collocation_Proxy_Broker *
 (*DynamicAny__TAO_DynEnum_Proxy_Broker_Factory_function_pointer) (
@@ -804,8 +792,6 @@ DynamicAny::NameDynAnyPairSeq::~NameDynAnyPairSeq (void)
 // TAO_IDL - Generated from
 // be/be_visitor_interface/interface_cs.cpp:60
 
-#if defined (_MSC_VER)
-
 // Traits specializations for DynamicAny::DynStruct.
 
 DynamicAny::DynStruct_ptr
@@ -839,8 +825,6 @@ TAO::Objref_Traits<DynamicAny::DynStruct>::tao_marshal (
   return p->marshal (cdr);
 }
 
-#endif /* _MSC_VER */
-
 // Function pointer for collocation factory initialization.
 TAO::Collocation_Proxy_Broker *
 (*DynamicAny__TAO_DynStruct_Proxy_Broker_Factory_function_pointer) (
@@ -928,8 +912,6 @@ DynamicAny::DynStruct::marshal (TAO_OutputCDR &)
 // TAO_IDL - Generated from
 // be/be_visitor_interface/interface_cs.cpp:60
 
-#if defined (_MSC_VER)
-
 // Traits specializations for DynamicAny::DynUnion.
 
 DynamicAny::DynUnion_ptr
@@ -963,8 +945,6 @@ TAO::Objref_Traits<DynamicAny::DynUnion>::tao_marshal (
   return p->marshal (cdr);
 }
 
-#endif /* _MSC_VER */
-
 // Function pointer for collocation factory initialization.
 TAO::Collocation_Proxy_Broker *
 (*DynamicAny__TAO_DynUnion_Proxy_Broker_Factory_function_pointer) (
@@ -1143,8 +1123,6 @@ DynamicAny::DynAnySeq::~DynAnySeq (void)
 // TAO_IDL - Generated from
 // be/be_visitor_interface/interface_cs.cpp:60
 
-#if defined (_MSC_VER)
-
 // Traits specializations for DynamicAny::DynSequence.
 
 DynamicAny::DynSequence_ptr
@@ -1178,8 +1156,6 @@ TAO::Objref_Traits<DynamicAny::DynSequence>::tao_marshal (
   return p->marshal (cdr);
 }
 
-#endif /* _MSC_VER */
-
 // Function pointer for collocation factory initialization.
 TAO::Collocation_Proxy_Broker *
 (*DynamicAny__TAO_DynSequence_Proxy_Broker_Factory_function_pointer) (
@@ -1267,8 +1243,6 @@ DynamicAny::DynSequence::marshal (TAO_OutputCDR &)
 // TAO_IDL - Generated from
 // be/be_visitor_interface/interface_cs.cpp:60
 
-#if defined (_MSC_VER)
-
 // Traits specializations for DynamicAny::DynArray.
 
 DynamicAny::DynArray_ptr
@@ -1302,8 +1276,6 @@ TAO::Objref_Traits<DynamicAny::DynArray>::tao_marshal (
   return p->marshal (cdr);
 }
 
-#endif /* _MSC_VER */
-
 // Function pointer for collocation factory initialization.
 TAO::Collocation_Proxy_Broker *
 (*DynamicAny__TAO_DynArray_Proxy_Broker_Factory_function_pointer) (
@@ -1391,8 +1363,6 @@ DynamicAny::DynArray::marshal (TAO_OutputCDR &)
 // TAO_IDL - Generated from
 // be/be_visitor_interface/interface_cs.cpp:60
 
-#if defined (_MSC_VER)
-
 // Traits specializations for DynamicAny::DynValue.
 
 DynamicAny::DynValue_ptr
@@ -1426,8 +1396,6 @@ TAO::Objref_Traits<DynamicAny::DynValue>::tao_marshal (
   return p->marshal (cdr);
 }
 
-#endif /* _MSC_VER */
-
 // Function pointer for collocation factory initialization.
 TAO::Collocation_Proxy_Broker *
 (*DynamicAny__TAO_DynValue_Proxy_Broker_Factory_function_pointer) (
@@ -1515,8 +1483,6 @@ DynamicAny::DynValue::marshal (TAO_OutputCDR &)
 // TAO_IDL - Generated from
 // be/be_visitor_interface/interface_cs.cpp:60
 
-#if defined (_MSC_VER)
-
 // Traits specializations for DynamicAny::DynAnyFactory.
 
 DynamicAny::DynAnyFactory_ptr
@@ -1550,8 +1516,6 @@ TAO::Objref_Traits<DynamicAny::DynAnyFactory>::tao_marshal (
   return p->marshal (cdr);
 }
 
-#endif /* _MSC_VER */
-
 // Function pointer for collocation factory initialization.
 TAO::Collocation_Proxy_Broker *
 (*DynamicAny__TAO_DynAnyFactory_Proxy_Broker_Factory_function_pointer) (
diff --git a/TAO/tao/DynamicAny/DynamicAnyC.h b/TAO/tao/DynamicAny/DynamicAnyC.h
index 5d3e663447b..1486b12814c 100644
--- a/TAO/tao/DynamicAny/DynamicAnyC.h
+++ b/TAO/tao/DynamicAny/DynamicAnyC.h
@@ -2201,8 +2201,6 @@ namespace DynamicAny
 // TAO_IDL - Generated from
 // be/be_visitor_traits.cpp:48
 
-#if defined (_MSC_VER)
-
 // Traits specializations.
 namespace TAO
 {
@@ -2397,8 +2395,6 @@ namespace TAO
 #endif /* end #if !defined */
 };
 
-#endif /* _MSC_VER */
-
 // TAO_IDL - Generated from
 // be/be_visitor_root/cdr_op.cpp:48
 
diff --git a/TAO/tao/IORInterceptor/IORInterceptorC.cpp b/TAO/tao/IORInterceptor/IORInterceptorC.cpp
index 6f3b3d9e0eb..26995e278e0 100644
--- a/TAO/tao/IORInterceptor/IORInterceptorC.cpp
+++ b/TAO/tao/IORInterceptor/IORInterceptorC.cpp
@@ -181,8 +181,6 @@ namespace TAO
 // TAO_IDL - Generated from
 // be/be_visitor_interface/interface_cs.cpp:60
 
-#if defined (_MSC_VER)
-
 // Traits specializations for PortableInterceptor::IORInfo.
 
 PortableInterceptor::IORInfo_ptr
@@ -216,8 +214,6 @@ TAO::Objref_Traits<PortableInterceptor::IORInfo>::tao_marshal (
   return p->marshal (cdr);
 }
 
-#endif /* _MSC_VER */
-
 // Function pointer for collocation factory initialization.
 TAO::Collocation_Proxy_Broker * 
 (*PortableInterceptor__TAO_IORInfo_Proxy_Broker_Factory_function_pointer) (
@@ -296,8 +292,6 @@ PortableInterceptor::IORInfo::marshal (TAO_OutputCDR &)
 // TAO_IDL - Generated from
 // be/be_visitor_interface/interface_cs.cpp:60
 
-#if defined (_MSC_VER)
-
 // Traits specializations for PortableInterceptor::IORInterceptor.
 
 PortableInterceptor::IORInterceptor_ptr
@@ -331,8 +325,6 @@ TAO::Objref_Traits<PortableInterceptor::IORInterceptor>::tao_marshal (
   return p->marshal (cdr);
 }
 
-#endif /* _MSC_VER */
-
 // Function pointer for collocation factory initialization.
 TAO::Collocation_Proxy_Broker * 
 (*PortableInterceptor__TAO_IORInterceptor_Proxy_Broker_Factory_function_pointer) (
diff --git a/TAO/tao/IORInterceptor/IORInterceptorC.h b/TAO/tao/IORInterceptor/IORInterceptorC.h
index 5317877b788..f8ed170a6cc 100644
--- a/TAO/tao/IORInterceptor/IORInterceptorC.h
+++ b/TAO/tao/IORInterceptor/IORInterceptorC.h
@@ -376,8 +376,6 @@ namespace PortableInterceptor
 // TAO_IDL - Generated from
 // be/be_visitor_traits.cpp:48
 
-#if defined (_MSC_VER)
-
 // Traits specializations.
 namespace TAO
 {
@@ -424,8 +422,6 @@ namespace TAO
 #endif /* end #if !defined */
 };
 
-#endif /* _MSC_VER */
-
 // TAO_IDL - Generated from
 // be/be_visitor_root/cdr_op.cpp:48
 
diff --git a/TAO/tao/IORManipulation/IORC.cpp b/TAO/tao/IORManipulation/IORC.cpp
index 8279a4e5fdb..887bc617c6e 100644
--- a/TAO/tao/IORManipulation/IORC.cpp
+++ b/TAO/tao/IORManipulation/IORC.cpp
@@ -809,8 +809,6 @@ namespace TAO_IOP
 // TAO_IDL - Generated from
 // be/be_visitor_interface/interface_cs.cpp:60
 
-#if defined (_MSC_VER)
-
 // Traits specializations for TAO_IOP::TAO_IOR_Property.
 
 TAO_IOP::TAO_IOR_Property_ptr
@@ -844,8 +842,6 @@ TAO::Objref_Traits<TAO_IOP::TAO_IOR_Property>::tao_marshal (
   return p->marshal (cdr);
 }
 
-#endif /* _MSC_VER */
-
 // Function pointer for collocation factory initialization.
 TAO::Collocation_Proxy_Broker *
 (*TAO_IOP__TAO_TAO_IOR_Property_Proxy_Broker_Factory_function_pointer) (
@@ -975,8 +971,6 @@ namespace TAO_IOP
 // TAO_IDL - Generated from
 // be/be_visitor_interface/interface_cs.cpp:60
 
-#if defined (_MSC_VER)
-
 // Traits specializations for TAO_IOP::TAO_IOR_Manipulation.
 
 TAO_IOP::TAO_IOR_Manipulation_ptr
@@ -1010,8 +1004,6 @@ TAO::Objref_Traits<TAO_IOP::TAO_IOR_Manipulation>::tao_marshal (
   return p->marshal (cdr);
 }
 
-#endif /* _MSC_VER */
-
 // Function pointer for collocation factory initialization.
 TAO::Collocation_Proxy_Broker *
 (*TAO_IOP__TAO_TAO_IOR_Manipulation_Proxy_Broker_Factory_function_pointer) (
diff --git a/TAO/tao/IORManipulation/IORC.h b/TAO/tao/IORManipulation/IORC.h
index 1fc86381f2b..ce405ae3b23 100644
--- a/TAO/tao/IORManipulation/IORC.h
+++ b/TAO/tao/IORManipulation/IORC.h
@@ -749,8 +749,6 @@ namespace TAO_IOP
 // TAO_IDL - Generated from
 // be/be_visitor_traits.cpp:48
 
-#if defined (_MSC_VER)
-
 // Traits specializations.
 namespace TAO
 {
@@ -798,8 +796,6 @@ namespace TAO
 #endif /* end #if !defined */
 };
 
-#endif /* _MSC_VER */
-
 // TAO_IDL - Generated from
 // be/be_visitor_exception/any_op_ch.cpp:52
 
diff --git a/TAO/tao/IORTable/IORTableC.cpp b/TAO/tao/IORTable/IORTableC.cpp
index d032f8580c3..08e053f1bd8 100644
--- a/TAO/tao/IORTable/IORTableC.cpp
+++ b/TAO/tao/IORTable/IORTableC.cpp
@@ -280,8 +280,6 @@ void IORTable::NotFound::_tao_decode (
 // TAO_IDL - Generated from
 // be/be_visitor_interface/interface_cs.cpp:60
 
-#if defined (_MSC_VER)
-
 // Traits specializations for IORTable::Table.
 
 IORTable::Table_ptr
@@ -315,8 +313,6 @@ TAO::Objref_Traits<IORTable::Table>::tao_marshal (
   return p->marshal (cdr);
 }
 
-#endif /* _MSC_VER */
-
 // Function pointer for collocation factory initialization.
 TAO::Collocation_Proxy_Broker *
 (*IORTable__TAO_Table_Proxy_Broker_Factory_function_pointer) (
@@ -395,8 +391,6 @@ IORTable::Table::marshal (TAO_OutputCDR &)
 // TAO_IDL - Generated from
 // be/be_visitor_interface/interface_cs.cpp:60
 
-#if defined (_MSC_VER)
-
 // Traits specializations for IORTable::Locator.
 
 IORTable::Locator_ptr
@@ -430,8 +424,6 @@ TAO::Objref_Traits<IORTable::Locator>::tao_marshal (
   return p->marshal (cdr);
 }
 
-#endif /* _MSC_VER */
-
 // Function pointer for collocation factory initialization.
 TAO::Collocation_Proxy_Broker *
 (*IORTable__TAO_Locator_Proxy_Broker_Factory_function_pointer) (
diff --git a/TAO/tao/IORTable/IORTableC.h b/TAO/tao/IORTable/IORTableC.h
index c514ca8c59a..bf0314207d9 100644
--- a/TAO/tao/IORTable/IORTableC.h
+++ b/TAO/tao/IORTable/IORTableC.h
@@ -374,8 +374,6 @@ namespace IORTable
 // TAO_IDL - Generated from
 // be/be_visitor_traits.cpp:48
 
-#if defined (_MSC_VER)
-
 // Traits specializations.
 namespace TAO
 {
@@ -423,8 +421,6 @@ namespace TAO
 #endif /* end #if !defined */
 };
 
-#endif /* _MSC_VER */
-
 // TAO_IDL - Generated from
 // be/be_visitor_root/cdr_op.cpp:48
 
diff --git a/TAO/tao/PortableInterceptorC.cpp b/TAO/tao/PortableInterceptorC.cpp
index 1f5a1ece69d..e1a74bdf18a 100644
--- a/TAO/tao/PortableInterceptorC.cpp
+++ b/TAO/tao/PortableInterceptorC.cpp
@@ -54,7 +54,6 @@ namespace TAO
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:60
 
-#if defined (_MSC_VER)
 
 // Traits specializations for PortableInterceptor::Interceptor.
 
@@ -89,7 +88,6 @@ TAO::Objref_Traits<PortableInterceptor::Interceptor>::tao_marshal (
   return p->marshal (cdr);
 }
 
-#endif /* _MSC_VER */
 
 // Function pointer for collocation factory initialization.
 TAO::Collocation_Proxy_Broker *
@@ -642,7 +640,6 @@ namespace PortableInterceptor
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:60
 
-#if defined (_MSC_VER)
 
 // Traits specializations for PortableInterceptor::Current.
 
@@ -677,7 +674,6 @@ TAO::Objref_Traits<PortableInterceptor::Current>::tao_marshal (
   return p->marshal (cdr);
 }
 
-#endif /* _MSC_VER */
 
 // Function pointer for collocation factory initialization.
 TAO::Collocation_Proxy_Broker *
@@ -811,8 +807,6 @@ namespace PortableInterceptor
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:60
 
-#if defined (_MSC_VER)
-
 // Traits specializations for PortableInterceptor::RequestInfo.
 
 PortableInterceptor::RequestInfo_ptr
@@ -846,8 +840,6 @@ TAO::Objref_Traits<PortableInterceptor::RequestInfo>::tao_marshal (
   return p->marshal (cdr);
 }
 
-#endif /* _MSC_VER */
-
 // Function pointer for collocation factory initialization.
 TAO::Collocation_Proxy_Broker *
 (*PortableInterceptor__TAO_RequestInfo_Proxy_Broker_Factory_function_pointer) (
@@ -978,8 +970,6 @@ namespace PortableInterceptor
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:60
 
-#if defined (_MSC_VER)
-
 // Traits specializations for PortableInterceptor::ClientRequestInfo.
 
 PortableInterceptor::ClientRequestInfo_ptr
@@ -1013,8 +1003,6 @@ TAO::Objref_Traits<PortableInterceptor::ClientRequestInfo>::tao_marshal (
   return p->marshal (cdr);
 }
 
-#endif /* _MSC_VER */
-
 // Function pointer for collocation factory initialization.
 TAO::Collocation_Proxy_Broker *
 (*PortableInterceptor__TAO_ClientRequestInfo_Proxy_Broker_Factory_function_pointer) (
@@ -1153,8 +1141,6 @@ namespace PortableInterceptor
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:60
 
-#if defined (_MSC_VER)
-
 // Traits specializations for PortableInterceptor::ServerRequestInfo.
 
 PortableInterceptor::ServerRequestInfo_ptr
@@ -1188,8 +1174,6 @@ TAO::Objref_Traits<PortableInterceptor::ServerRequestInfo>::tao_marshal (
   return p->marshal (cdr);
 }
 
-#endif /* _MSC_VER */
-
 // Function pointer for collocation factory initialization.
 TAO::Collocation_Proxy_Broker *
 (*PortableInterceptor__TAO_ServerRequestInfo_Proxy_Broker_Factory_function_pointer) (
@@ -1328,8 +1312,6 @@ namespace PortableInterceptor
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:60
 
-#if defined (_MSC_VER)
-
 // Traits specializations for PortableInterceptor::ClientRequestInterceptor.
 
 PortableInterceptor::ClientRequestInterceptor_ptr
@@ -1363,8 +1345,6 @@ TAO::Objref_Traits<PortableInterceptor::ClientRequestInterceptor>::tao_marshal (
   return p->marshal (cdr);
 }
 
-#endif /* _MSC_VER */
-
 // Function pointer for collocation factory initialization.
 TAO::Collocation_Proxy_Broker *
 (*PortableInterceptor__TAO_ClientRequestInterceptor_Proxy_Broker_Factory_function_pointer) (
@@ -1508,8 +1488,6 @@ namespace PortableInterceptor
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:60
 
-#if defined (_MSC_VER)
-
 // Traits specializations for PortableInterceptor::ServerRequestInterceptor.
 
 PortableInterceptor::ServerRequestInterceptor_ptr
@@ -1543,8 +1521,6 @@ TAO::Objref_Traits<PortableInterceptor::ServerRequestInterceptor>::tao_marshal (
   return p->marshal (cdr);
 }
 
-#endif /* _MSC_VER */
-
 // Function pointer for collocation factory initialization.
 TAO::Collocation_Proxy_Broker *
 (*PortableInterceptor__TAO_ServerRequestInterceptor_Proxy_Broker_Factory_function_pointer) (
@@ -1687,8 +1663,6 @@ namespace PortableInterceptor
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:60
 
-#if defined (_MSC_VER)
-
 // Traits specializations for PortableInterceptor::PolicyFactory.
 
 PortableInterceptor::PolicyFactory_ptr
@@ -1722,8 +1696,6 @@ TAO::Objref_Traits<PortableInterceptor::PolicyFactory>::tao_marshal (
   return p->marshal (cdr);
 }
 
-#endif /* _MSC_VER */
-
 // Function pointer for collocation factory initialization.
 TAO::Collocation_Proxy_Broker *
 (*PortableInterceptor__TAO_PolicyFactory_Proxy_Broker_Factory_function_pointer) (
@@ -1868,7 +1840,6 @@ namespace PortableInterceptor
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:60
 
-#if defined (_MSC_VER)
 
 // Traits specializations for PortableInterceptor::ORBInitInfo.
 
@@ -1903,7 +1874,6 @@ TAO::Objref_Traits<PortableInterceptor::ORBInitInfo>::tao_marshal (
   return p->marshal (cdr);
 }
 
-#endif /* _MSC_VER */
 
 // Function pointer for collocation factory initialization.
 TAO::Collocation_Proxy_Broker *
@@ -2373,7 +2343,6 @@ namespace PortableInterceptor
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:60
 
-#if defined (_MSC_VER)
 
 // Traits specializations for PortableInterceptor::ORBInitializer.
 
@@ -2408,7 +2377,6 @@ TAO::Objref_Traits<PortableInterceptor::ORBInitializer>::tao_marshal (
   return p->marshal (cdr);
 }
 
-#endif /* _MSC_VER */
 
 // Function pointer for collocation factory initialization.
 TAO::Collocation_Proxy_Broker *
diff --git a/TAO/tao/PortableInterceptorC.h b/TAO/tao/PortableInterceptorC.h
index e4f108707b5..89ec0ba0a49 100644
--- a/TAO/tao/PortableInterceptorC.h
+++ b/TAO/tao/PortableInterceptorC.h
@@ -1858,7 +1858,6 @@ namespace PortableInterceptor
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_traits.cpp:48
 
-#if defined (_MSC_VER)
 
 // Traits specializations.
 namespace TAO
@@ -1866,7 +1865,7 @@ namespace TAO
 
 #if !defined (_PORTABLEINTERCEPTOR_INTERCEPTOR__TRAITS_CH_)
 #define _PORTABLEINTERCEPTOR_INTERCEPTOR__TRAITS_CH_
-  
+
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_Export Objref_Traits<PortableInterceptor::Interceptor>
   {
@@ -1887,7 +1886,7 @@ namespace TAO
 
 #if !defined (_PORTABLEINTERCEPTOR_CURRENT__TRAITS_CH_)
 #define _PORTABLEINTERCEPTOR_CURRENT__TRAITS_CH_
-  
+
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_Export Objref_Traits<PortableInterceptor::Current>
   {
@@ -1908,7 +1907,7 @@ namespace TAO
 
 #if !defined (_PORTABLEINTERCEPTOR_REQUESTINFO__TRAITS_CH_)
 #define _PORTABLEINTERCEPTOR_REQUESTINFO__TRAITS_CH_
-  
+
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_Export Objref_Traits<PortableInterceptor::RequestInfo>
   {
@@ -1929,7 +1928,7 @@ namespace TAO
 
 #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__TRAITS_CH_)
 #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__TRAITS_CH_
-  
+
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_Export Objref_Traits<PortableInterceptor::ClientRequestInfo>
   {
@@ -1950,7 +1949,7 @@ namespace TAO
 
 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO__TRAITS_CH_)
 #define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO__TRAITS_CH_
-  
+
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_Export Objref_Traits<PortableInterceptor::ServerRequestInfo>
   {
@@ -1971,7 +1970,7 @@ namespace TAO
 
 #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__TRAITS_CH_)
 #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__TRAITS_CH_
-  
+
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_Export Objref_Traits<PortableInterceptor::ClientRequestInterceptor>
   {
@@ -1992,7 +1991,7 @@ namespace TAO
 
 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__TRAITS_CH_)
 #define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__TRAITS_CH_
-  
+
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_Export Objref_Traits<PortableInterceptor::ServerRequestInterceptor>
   {
@@ -2013,7 +2012,7 @@ namespace TAO
 
 #if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY__TRAITS_CH_)
 #define _PORTABLEINTERCEPTOR_POLICYFACTORY__TRAITS_CH_
-  
+
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_Export Objref_Traits<PortableInterceptor::PolicyFactory>
   {
@@ -2034,7 +2033,7 @@ namespace TAO
 
 #if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO__TRAITS_CH_)
 #define _PORTABLEINTERCEPTOR_ORBINITINFO__TRAITS_CH_
-  
+
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_Export Objref_Traits<PortableInterceptor::ORBInitInfo>
   {
@@ -2055,7 +2054,7 @@ namespace TAO
 
 #if !defined (_PORTABLEINTERCEPTOR_ORBINITIALIZER__TRAITS_CH_)
 #define _PORTABLEINTERCEPTOR_ORBINITIALIZER__TRAITS_CH_
-  
+
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_Export Objref_Traits<PortableInterceptor::ORBInitializer>
   {
@@ -2075,7 +2074,6 @@ namespace TAO
 #endif /* end #if !defined */
 };
 
-#endif /* _MSC_VER */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
diff --git a/TAO/tao/PortableServer/ImR_LocatorC.cpp b/TAO/tao/PortableServer/ImR_LocatorC.cpp
index 1159068a12d..05b54a2680c 100644
--- a/TAO/tao/PortableServer/ImR_LocatorC.cpp
+++ b/TAO/tao/PortableServer/ImR_LocatorC.cpp
@@ -60,8 +60,6 @@ namespace TAO
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:60
 
-#if defined (_MSC_VER)
-
 // Traits specializations for ImplementationRepository::Locator.
 
 ImplementationRepository::Locator_ptr
@@ -95,8 +93,6 @@ TAO::Objref_Traits<ImplementationRepository::Locator>::tao_marshal (
   return p->marshal (cdr);
 }
 
-#endif /* _MSC_VER */
-
 // Function pointer for collocation factory initialization.
 TAO::Collocation_Proxy_Broker * 
 (*ImplementationRepository__TAO_Locator_Proxy_Broker_Factory_function_pointer) (
diff --git a/TAO/tao/PortableServer/ImR_LocatorC.h b/TAO/tao/PortableServer/ImR_LocatorC.h
index 91d53323bb4..1126c7da945 100644
--- a/TAO/tao/PortableServer/ImR_LocatorC.h
+++ b/TAO/tao/PortableServer/ImR_LocatorC.h
@@ -273,8 +273,6 @@ TAO::Collocation_Proxy_Broker *
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_traits.cpp:48
 
-#if defined (_MSC_VER)
-
 // Traits specializations.
 namespace TAO
 {
@@ -301,8 +299,6 @@ namespace TAO
 #endif /* end #if !defined */
 };
 
-#endif /* _MSC_VER */
-
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
 
diff --git a/TAO/tao/PortableServer/ImplRepoC.cpp b/TAO/tao/PortableServer/ImplRepoC.cpp
index d22fd00ba07..63f5d9ae504 100644
--- a/TAO/tao/PortableServer/ImplRepoC.cpp
+++ b/TAO/tao/PortableServer/ImplRepoC.cpp
@@ -189,8 +189,6 @@ namespace TAO
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:60
 
-#if defined (_MSC_VER)
-
 // Traits specializations for ImplementationRepository::ServerObject.
 
 ImplementationRepository::ServerObject_ptr
@@ -224,8 +222,6 @@ TAO::Objref_Traits<ImplementationRepository::ServerObject>::tao_marshal (
   return p->marshal (cdr);
 }
 
-#endif /* _MSC_VER */
-
 // Function pointer for collocation factory initialization.
 TAO::Collocation_Proxy_Broker *
 (*ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function_pointer) (
@@ -1964,8 +1960,6 @@ namespace ImplementationRepository
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:60
 
-#if defined (_MSC_VER)
-
 // Traits specializations for ImplementationRepository::Administration.
 
 ImplementationRepository::Administration_ptr
@@ -1999,8 +1993,6 @@ TAO::Objref_Traits<ImplementationRepository::Administration>::tao_marshal (
   return p->marshal (cdr);
 }
 
-#endif /* _MSC_VER */
-
 // Function pointer for collocation factory initialization.
 TAO::Collocation_Proxy_Broker *
 (*ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function_pointer) (
@@ -2754,8 +2746,6 @@ namespace ImplementationRepository
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:60
 
-#if defined (_MSC_VER)
-
 // Traits specializations for ImplementationRepository::ServerInformationIterator.
 
 ImplementationRepository::ServerInformationIterator_ptr
@@ -2789,8 +2779,6 @@ TAO::Objref_Traits<ImplementationRepository::ServerInformationIterator>::tao_mar
   return p->marshal (cdr);
 }
 
-#endif /* _MSC_VER */
-
 // Function pointer for collocation factory initialization.
 TAO::Collocation_Proxy_Broker *
 (*ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function_pointer) (
diff --git a/TAO/tao/PortableServer/ImplRepoC.h b/TAO/tao/PortableServer/ImplRepoC.h
index 9a709c49528..f1c836e57d5 100644
--- a/TAO/tao/PortableServer/ImplRepoC.h
+++ b/TAO/tao/PortableServer/ImplRepoC.h
@@ -964,8 +964,6 @@ TAO::Collocation_Proxy_Broker *
     CORBA::Object_ptr obj
   );
 
-#if defined (_MSC_VER)
-
 // Traits specializations.
 namespace TAO
 {
@@ -1034,8 +1032,6 @@ namespace TAO
 #endif /* end #if !defined */
 };
 
-#endif /* _MSC_VER */
-
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
 
diff --git a/TAO/tao/PortableServer/PortableServerC.cpp b/TAO/tao/PortableServer/PortableServerC.cpp
index 15e2700a365..ea0eda38bcf 100644
--- a/TAO/tao/PortableServer/PortableServerC.cpp
+++ b/TAO/tao/PortableServer/PortableServerC.cpp
@@ -1228,8 +1228,6 @@ namespace PortableServer
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:60
 
-#if defined (_MSC_VER)
-
 // Traits specializations for PortableServer::ThreadPolicy.
 
 PortableServer::ThreadPolicy_ptr
@@ -1263,8 +1261,6 @@ TAO::Objref_Traits<PortableServer::ThreadPolicy>::tao_marshal (
   return p->marshal (cdr);
 }
 
-#endif /* _MSC_VER */
-
 // Function pointer for collocation factory initialization.
 TAO::Collocation_Proxy_Broker *
 (*PortableServer__TAO_ThreadPolicy_Proxy_Broker_Factory_function_pointer) (
@@ -1452,8 +1448,6 @@ namespace PortableServer
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:60
 
-#if defined (_MSC_VER)
-
 // Traits specializations for PortableServer::LifespanPolicy.
 
 PortableServer::LifespanPolicy_ptr
@@ -1487,8 +1481,6 @@ TAO::Objref_Traits<PortableServer::LifespanPolicy>::tao_marshal (
   return p->marshal (cdr);
 }
 
-#endif /* _MSC_VER */
-
 // Function pointer for collocation factory initialization.
 TAO::Collocation_Proxy_Broker *
 (*PortableServer__TAO_LifespanPolicy_Proxy_Broker_Factory_function_pointer) (
@@ -1677,8 +1669,6 @@ namespace PortableServer
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:60
 
-#if defined (_MSC_VER)
-
 // Traits specializations for PortableServer::IdUniquenessPolicy.
 
 PortableServer::IdUniquenessPolicy_ptr
@@ -1712,8 +1702,6 @@ TAO::Objref_Traits<PortableServer::IdUniquenessPolicy>::tao_marshal (
   return p->marshal (cdr);
 }
 
-#endif /* _MSC_VER */
-
 // Function pointer for collocation factory initialization.
 TAO::Collocation_Proxy_Broker *
 (*PortableServer__TAO_IdUniquenessPolicy_Proxy_Broker_Factory_function_pointer) (
@@ -1903,8 +1891,6 @@ namespace PortableServer
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:60
 
-#if defined (_MSC_VER)
-
 // Traits specializations for PortableServer::IdAssignmentPolicy.
 
 PortableServer::IdAssignmentPolicy_ptr
@@ -1938,8 +1924,6 @@ TAO::Objref_Traits<PortableServer::IdAssignmentPolicy>::tao_marshal (
   return p->marshal (cdr);
 }
 
-#endif /* _MSC_VER */
-
 // Function pointer for collocation factory initialization.
 TAO::Collocation_Proxy_Broker *
 (*PortableServer__TAO_IdAssignmentPolicy_Proxy_Broker_Factory_function_pointer) (
@@ -2141,8 +2125,6 @@ namespace PortableServer
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:60
 
-#if defined (_MSC_VER)
-
 // Traits specializations for PortableServer::ImplicitActivationPolicy.
 
 PortableServer::ImplicitActivationPolicy_ptr
@@ -2176,8 +2158,6 @@ TAO::Objref_Traits<PortableServer::ImplicitActivationPolicy>::tao_marshal (
   return p->marshal (cdr);
 }
 
-#endif /* _MSC_VER */
-
 // Function pointer for collocation factory initialization.
 TAO::Collocation_Proxy_Broker *
 (*PortableServer__TAO_ImplicitActivationPolicy_Proxy_Broker_Factory_function_pointer) (
@@ -2372,8 +2352,6 @@ namespace PortableServer
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:60
 
-#if defined (_MSC_VER)
-
 // Traits specializations for PortableServer::ServantRetentionPolicy.
 
 PortableServer::ServantRetentionPolicy_ptr
@@ -2407,8 +2385,6 @@ TAO::Objref_Traits<PortableServer::ServantRetentionPolicy>::tao_marshal (
   return p->marshal (cdr);
 }
 
-#endif /* _MSC_VER */
-
 // Function pointer for collocation factory initialization.
 TAO::Collocation_Proxy_Broker *
 (*PortableServer__TAO_ServantRetentionPolicy_Proxy_Broker_Factory_function_pointer) (
@@ -2616,8 +2592,6 @@ namespace PortableServer
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:60
 
-#if defined (_MSC_VER)
-
 // Traits specializations for PortableServer::RequestProcessingPolicy.
 
 PortableServer::RequestProcessingPolicy_ptr
@@ -2651,8 +2625,6 @@ TAO::Objref_Traits<PortableServer::RequestProcessingPolicy>::tao_marshal (
   return p->marshal (cdr);
 }
 
-#endif /* _MSC_VER */
-
 // Function pointer for collocation factory initialization.
 TAO::Collocation_Proxy_Broker *
 (*PortableServer__TAO_RequestProcessingPolicy_Proxy_Broker_Factory_function_pointer) (
@@ -2794,8 +2766,6 @@ namespace PortableServer
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:60
 
-#if defined (_MSC_VER)
-
 // Traits specializations for PortableServer::POAManager.
 
 PortableServer::POAManager_ptr
@@ -2829,8 +2799,6 @@ TAO::Objref_Traits<PortableServer::POAManager>::tao_marshal (
   return p->marshal (cdr);
 }
 
-#endif /* _MSC_VER */
-
 // Function pointer for collocation factory initialization.
 TAO::Collocation_Proxy_Broker *
 (*PortableServer__TAO_POAManager_Proxy_Broker_Factory_function_pointer) (
@@ -3099,8 +3067,6 @@ namespace PortableServer
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:60
 
-#if defined (_MSC_VER)
-
 // Traits specializations for PortableServer::AdapterActivator.
 
 PortableServer::AdapterActivator_ptr
@@ -3134,8 +3100,6 @@ TAO::Objref_Traits<PortableServer::AdapterActivator>::tao_marshal (
   return p->marshal (cdr);
 }
 
-#endif /* _MSC_VER */
-
 // Function pointer for collocation factory initialization.
 TAO::Collocation_Proxy_Broker *
 (*PortableServer__TAO_AdapterActivator_Proxy_Broker_Factory_function_pointer) (
@@ -3268,8 +3232,6 @@ namespace PortableServer
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:60
 
-#if defined (_MSC_VER)
-
 // Traits specializations for PortableServer::ServantManager.
 
 PortableServer::ServantManager_ptr
@@ -3303,8 +3265,6 @@ TAO::Objref_Traits<PortableServer::ServantManager>::tao_marshal (
   return p->marshal (cdr);
 }
 
-#endif /* _MSC_VER */
-
 // Function pointer for collocation factory initialization.
 TAO::Collocation_Proxy_Broker *
 (*PortableServer__TAO_ServantManager_Proxy_Broker_Factory_function_pointer) (
@@ -3436,8 +3396,6 @@ namespace PortableServer
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:60
 
-#if defined (_MSC_VER)
-
 // Traits specializations for PortableServer::ServantActivator.
 
 PortableServer::ServantActivator_ptr
@@ -3471,8 +3429,6 @@ TAO::Objref_Traits<PortableServer::ServantActivator>::tao_marshal (
   return p->marshal (cdr);
 }
 
-#endif /* _MSC_VER */
-
 // Function pointer for collocation factory initialization.
 TAO::Collocation_Proxy_Broker *
 (*PortableServer__TAO_ServantActivator_Proxy_Broker_Factory_function_pointer) (
@@ -3609,8 +3565,6 @@ namespace PortableServer
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:60
 
-#if defined (_MSC_VER)
-
 // Traits specializations for PortableServer::ServantLocator.
 
 PortableServer::ServantLocator_ptr
@@ -3644,8 +3598,6 @@ TAO::Objref_Traits<PortableServer::ServantLocator>::tao_marshal (
   return p->marshal (cdr);
 }
 
-#endif /* _MSC_VER */
-
 // Function pointer for collocation factory initialization.
 TAO::Collocation_Proxy_Broker *
 (*PortableServer__TAO_ServantLocator_Proxy_Broker_Factory_function_pointer) (
@@ -3783,8 +3735,6 @@ namespace PortableServer
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:60
 
-#if defined (_MSC_VER)
-
 // Traits specializations for PortableServer::POA.
 
 PortableServer::POA_ptr
@@ -3818,8 +3768,6 @@ TAO::Objref_Traits<PortableServer::POA>::tao_marshal (
   return p->marshal (cdr);
 }
 
-#endif /* _MSC_VER */
-
 // Function pointer for collocation factory initialization.
 TAO::Collocation_Proxy_Broker *
 (*PortableServer__TAO_POA_Proxy_Broker_Factory_function_pointer) (
@@ -5328,8 +5276,6 @@ namespace PortableServer
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:60
 
-#if defined (_MSC_VER)
-
 // Traits specializations for PortableServer::Current.
 
 PortableServer::Current_ptr
@@ -5363,8 +5309,6 @@ TAO::Objref_Traits<PortableServer::Current>::tao_marshal (
   return p->marshal (cdr);
 }
 
-#endif /* _MSC_VER */
-
 // Function pointer for collocation factory initialization.
 TAO::Collocation_Proxy_Broker *
 (*PortableServer__TAO_Current_Proxy_Broker_Factory_function_pointer) (
diff --git a/TAO/tao/PortableServer/PortableServerC.h b/TAO/tao/PortableServer/PortableServerC.h
index 56390d485dd..a3ae2e81618 100644
--- a/TAO/tao/PortableServer/PortableServerC.h
+++ b/TAO/tao/PortableServer/PortableServerC.h
@@ -2904,8 +2904,6 @@ namespace PortableServer
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_traits.cpp:48
 
-#if defined (_MSC_VER)
-
 // Traits specializations.
 namespace TAO
 {
@@ -3205,8 +3203,6 @@ namespace TAO
 #endif /* end #if !defined */
 };
 
-#endif /* _MSC_VER */
-
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52
 
diff --git a/TAO/tao/RTCORBA/RTCORBAC.cpp b/TAO/tao/RTCORBA/RTCORBAC.cpp
index 64e4c810df4..bb822b1a237 100644
--- a/TAO/tao/RTCORBA/RTCORBAC.cpp
+++ b/TAO/tao/RTCORBA/RTCORBAC.cpp
@@ -743,8 +743,6 @@ namespace RTCORBA
 // TAO_IDL - Generated from
 // be/be_visitor_interface/interface_cs.cpp:60
 
-#if defined (_MSC_VER)
-
 // Traits specializations for RTCORBA::PriorityModelPolicy.
 
 RTCORBA::PriorityModelPolicy_ptr
@@ -778,8 +776,6 @@ TAO::Objref_Traits<RTCORBA::PriorityModelPolicy>::tao_marshal (
   return p->marshal (cdr);
 }
 
-#endif /* _MSC_VER */
-
 // Function pointer for collocation factory initialization.
 TAO::Collocation_Proxy_Broker *
 (*RTCORBA__TAO_PriorityModelPolicy_Proxy_Broker_Factory_function_pointer) (
@@ -910,8 +906,6 @@ namespace RTCORBA
 // TAO_IDL - Generated from
 // be/be_visitor_interface/interface_cs.cpp:60
 
-#if defined (_MSC_VER)
-
 // Traits specializations for RTCORBA::ThreadpoolPolicy.
 
 RTCORBA::ThreadpoolPolicy_ptr
@@ -945,8 +939,6 @@ TAO::Objref_Traits<RTCORBA::ThreadpoolPolicy>::tao_marshal (
   return p->marshal (cdr);
 }
 
-#endif /* _MSC_VER */
-
 // Function pointer for collocation factory initialization.
 TAO::Collocation_Proxy_Broker *
 (*RTCORBA__TAO_ThreadpoolPolicy_Proxy_Broker_Factory_function_pointer) (
@@ -1077,8 +1069,6 @@ namespace RTCORBA
 // TAO_IDL - Generated from
 // be/be_visitor_interface/interface_cs.cpp:60
 
-#if defined (_MSC_VER)
-
 // Traits specializations for RTCORBA::ProtocolProperties.
 
 RTCORBA::ProtocolProperties_ptr
@@ -1112,8 +1102,6 @@ TAO::Objref_Traits<RTCORBA::ProtocolProperties>::tao_marshal (
   return p->marshal (cdr);
 }
 
-#endif /* _MSC_VER */
-
 // Function pointer for collocation factory initialization.
 TAO::Collocation_Proxy_Broker *
 (*RTCORBA__TAO_ProtocolProperties_Proxy_Broker_Factory_function_pointer) (
@@ -1573,8 +1561,6 @@ namespace RTCORBA
 // TAO_IDL - Generated from
 // be/be_visitor_interface/interface_cs.cpp:60
 
-#if defined (_MSC_VER)
-
 // Traits specializations for RTCORBA::ServerProtocolPolicy.
 
 RTCORBA::ServerProtocolPolicy_ptr
@@ -1608,8 +1594,6 @@ TAO::Objref_Traits<RTCORBA::ServerProtocolPolicy>::tao_marshal (
   return p->marshal (cdr);
 }
 
-#endif /* _MSC_VER */
-
 // Function pointer for collocation factory initialization.
 TAO::Collocation_Proxy_Broker *
 (*RTCORBA__TAO_ServerProtocolPolicy_Proxy_Broker_Factory_function_pointer) (
@@ -1742,8 +1726,6 @@ namespace RTCORBA
 // TAO_IDL - Generated from
 // be/be_visitor_interface/interface_cs.cpp:60
 
-#if defined (_MSC_VER)
-
 // Traits specializations for RTCORBA::ClientProtocolPolicy.
 
 RTCORBA::ClientProtocolPolicy_ptr
@@ -1777,8 +1759,6 @@ TAO::Objref_Traits<RTCORBA::ClientProtocolPolicy>::tao_marshal (
   return p->marshal (cdr);
 }
 
-#endif /* _MSC_VER */
-
 // Function pointer for collocation factory initialization.
 TAO::Collocation_Proxy_Broker *
 (*RTCORBA__TAO_ClientProtocolPolicy_Proxy_Broker_Factory_function_pointer) (
@@ -1911,8 +1891,6 @@ namespace RTCORBA
 // TAO_IDL - Generated from
 // be/be_visitor_interface/interface_cs.cpp:60
 
-#if defined (_MSC_VER)
-
 // Traits specializations for RTCORBA::PrivateConnectionPolicy.
 
 RTCORBA::PrivateConnectionPolicy_ptr
@@ -1946,8 +1924,6 @@ TAO::Objref_Traits<RTCORBA::PrivateConnectionPolicy>::tao_marshal (
   return p->marshal (cdr);
 }
 
-#endif /* _MSC_VER */
-
 // Function pointer for collocation factory initialization.
 TAO::Collocation_Proxy_Broker *
 (*RTCORBA__TAO_PrivateConnectionPolicy_Proxy_Broker_Factory_function_pointer) (
@@ -2080,8 +2056,6 @@ namespace RTCORBA
 // TAO_IDL - Generated from
 // be/be_visitor_interface/interface_cs.cpp:60
 
-#if defined (_MSC_VER)
-
 // Traits specializations for RTCORBA::TCPProtocolProperties.
 
 RTCORBA::TCPProtocolProperties_ptr
@@ -2115,8 +2089,6 @@ TAO::Objref_Traits<RTCORBA::TCPProtocolProperties>::tao_marshal (
   return p->marshal (cdr);
 }
 
-#endif /* _MSC_VER */
-
 // Function pointer for collocation factory initialization.
 TAO::Collocation_Proxy_Broker *
 (*RTCORBA__TAO_TCPProtocolProperties_Proxy_Broker_Factory_function_pointer) (
@@ -2249,8 +2221,6 @@ namespace RTCORBA
 // TAO_IDL - Generated from
 // be/be_visitor_interface/interface_cs.cpp:60
 
-#if defined (_MSC_VER)
-
 // Traits specializations for RTCORBA::GIOPProtocolProperties.
 
 RTCORBA::GIOPProtocolProperties_ptr
@@ -2284,8 +2254,6 @@ TAO::Objref_Traits<RTCORBA::GIOPProtocolProperties>::tao_marshal (
   return p->marshal (cdr);
 }
 
-#endif /* _MSC_VER */
-
 // Function pointer for collocation factory initialization.
 TAO::Collocation_Proxy_Broker *
 (*RTCORBA__TAO_GIOPProtocolProperties_Proxy_Broker_Factory_function_pointer) (
@@ -2418,8 +2386,6 @@ namespace RTCORBA
 // TAO_IDL - Generated from
 // be/be_visitor_interface/interface_cs.cpp:60
 
-#if defined (_MSC_VER)
-
 // Traits specializations for RTCORBA::UnixDomainProtocolProperties.
 
 RTCORBA::UnixDomainProtocolProperties_ptr
@@ -2453,8 +2419,6 @@ TAO::Objref_Traits<RTCORBA::UnixDomainProtocolProperties>::tao_marshal (
   return p->marshal (cdr);
 }
 
-#endif /* _MSC_VER */
-
 // Function pointer for collocation factory initialization.
 TAO::Collocation_Proxy_Broker *
 (*RTCORBA__TAO_UnixDomainProtocolProperties_Proxy_Broker_Factory_function_pointer) (
@@ -2591,8 +2555,6 @@ namespace RTCORBA
 // TAO_IDL - Generated from
 // be/be_visitor_interface/interface_cs.cpp:60
 
-#if defined (_MSC_VER)
-
 // Traits specializations for RTCORBA::SharedMemoryProtocolProperties.
 
 RTCORBA::SharedMemoryProtocolProperties_ptr
@@ -2626,8 +2588,6 @@ TAO::Objref_Traits<RTCORBA::SharedMemoryProtocolProperties>::tao_marshal (
   return p->marshal (cdr);
 }
 
-#endif /* _MSC_VER */
-
 // Function pointer for collocation factory initialization.
 TAO::Collocation_Proxy_Broker *
 (*RTCORBA__TAO_SharedMemoryProtocolProperties_Proxy_Broker_Factory_function_pointer) (
@@ -3023,8 +2983,6 @@ namespace RTCORBA
 // TAO_IDL - Generated from
 // be/be_visitor_interface/interface_cs.cpp:60
 
-#if defined (_MSC_VER)
-
 // Traits specializations for RTCORBA::PriorityBandedConnectionPolicy.
 
 RTCORBA::PriorityBandedConnectionPolicy_ptr
@@ -3058,8 +3016,6 @@ TAO::Objref_Traits<RTCORBA::PriorityBandedConnectionPolicy>::tao_marshal (
   return p->marshal (cdr);
 }
 
-#endif /* _MSC_VER */
-
 // Function pointer for collocation factory initialization.
 TAO::Collocation_Proxy_Broker *
 (*RTCORBA__TAO_PriorityBandedConnectionPolicy_Proxy_Broker_Factory_function_pointer) (
@@ -3196,8 +3152,6 @@ namespace RTCORBA
 // TAO_IDL - Generated from
 // be/be_visitor_interface/interface_cs.cpp:60
 
-#if defined (_MSC_VER)
-
 // Traits specializations for RTCORBA::Current.
 
 RTCORBA::Current_ptr
@@ -3231,8 +3185,6 @@ TAO::Objref_Traits<RTCORBA::Current>::tao_marshal (
   return p->marshal (cdr);
 }
 
-#endif /* _MSC_VER */
-
 // Function pointer for collocation factory initialization.
 TAO::Collocation_Proxy_Broker *
 (*RTCORBA__TAO_Current_Proxy_Broker_Factory_function_pointer) (
@@ -3357,8 +3309,6 @@ namespace RTCORBA
 // TAO_IDL - Generated from
 // be/be_visitor_interface/interface_cs.cpp:60
 
-#if defined (_MSC_VER)
-
 // Traits specializations for RTCORBA::Mutex.
 
 RTCORBA::Mutex_ptr
@@ -3392,8 +3342,6 @@ TAO::Objref_Traits<RTCORBA::Mutex>::tao_marshal (
   return p->marshal (cdr);
 }
 
-#endif /* _MSC_VER */
-
 // Function pointer for collocation factory initialization.
 TAO::Collocation_Proxy_Broker *
 (*RTCORBA__TAO_Mutex_Proxy_Broker_Factory_function_pointer) (
@@ -3514,8 +3462,6 @@ namespace RTCORBA
 // TAO_IDL - Generated from
 // be/be_visitor_interface/interface_cs.cpp:60
 
-#if defined (_MSC_VER)
-
 // Traits specializations for RTCORBA::RTORB.
 
 RTCORBA::RTORB_ptr
@@ -3549,8 +3495,6 @@ TAO::Objref_Traits<RTCORBA::RTORB>::tao_marshal (
   return p->marshal (cdr);
 }
 
-#endif /* _MSC_VER */
-
 // Function pointer for collocation factory initialization.
 TAO::Collocation_Proxy_Broker *
 (*RTCORBA__TAO_RTORB_Proxy_Broker_Factory_function_pointer) (
diff --git a/TAO/tao/RTCORBA/RTCORBAC.h b/TAO/tao/RTCORBA/RTCORBAC.h
index 4ae6efa695b..955a4dfdcb4 100644
--- a/TAO/tao/RTCORBA/RTCORBAC.h
+++ b/TAO/tao/RTCORBA/RTCORBAC.h
@@ -2197,8 +2197,6 @@ namespace RTCORBA
 // TAO_IDL - Generated from
 // be/be_visitor_traits.cpp:48
 
-#if defined (_MSC_VER)
-
 // Traits specializations.
 namespace TAO
 {
@@ -2498,8 +2496,6 @@ namespace TAO
 #endif /* end #if !defined */
 };
 
-#endif /* _MSC_VER */
-
 // TAO_IDL - Generated from
 // be/be_visitor_structure/any_op_ch.cpp:52
 
diff --git a/TAO/tao/RTPortableServer/RTPortableServerC.cpp b/TAO/tao/RTPortableServer/RTPortableServerC.cpp
index d2bc67dc865..2d7379c0c06 100644
--- a/TAO/tao/RTPortableServer/RTPortableServerC.cpp
+++ b/TAO/tao/RTPortableServer/RTPortableServerC.cpp
@@ -100,8 +100,6 @@ namespace TAO
 // TAO_IDL - Generated from
 // be/be_visitor_interface/interface_cs.cpp:60
 
-#if defined (_MSC_VER)
-
 // Traits specializations for RTPortableServer::POA.
 
 RTPortableServer::POA_ptr
@@ -135,8 +133,6 @@ TAO::Objref_Traits<RTPortableServer::POA>::tao_marshal (
   return p->marshal (cdr);
 }
 
-#endif /* _MSC_VER */
-
 // Function pointer for collocation factory initialization.
 TAO::Collocation_Proxy_Broker *
 (*RTPortableServer__TAO_POA_Proxy_Broker_Factory_function_pointer) (
diff --git a/TAO/tao/RTPortableServer/RTPortableServerC.h b/TAO/tao/RTPortableServer/RTPortableServerC.h
index 8c1e1bb4d86..1b7f7a6b834 100644
--- a/TAO/tao/RTPortableServer/RTPortableServerC.h
+++ b/TAO/tao/RTPortableServer/RTPortableServerC.h
@@ -229,8 +229,6 @@ namespace RTPortableServer
 // TAO_IDL - Generated from
 // be/be_visitor_traits.cpp:48
 
-#if defined (_MSC_VER)
-
 // Traits specializations.
 namespace TAO
 {
@@ -257,8 +255,6 @@ namespace TAO
 #endif /* end #if !defined */
 };
 
-#endif /* _MSC_VER */
-
 // TAO_IDL - Generated from
 // be/be_visitor_interface/any_op_ch.cpp:52
 
diff --git a/TAO/tao/RTScheduling/RTSchedulerC.cpp b/TAO/tao/RTScheduling/RTSchedulerC.cpp
index 834f1f4ce0d..c4a6f0997c9 100644
--- a/TAO/tao/RTScheduling/RTSchedulerC.cpp
+++ b/TAO/tao/RTScheduling/RTSchedulerC.cpp
@@ -252,8 +252,6 @@ namespace TAO
 // TAO_IDL - Generated from
 // be/be_visitor_interface/interface_cs.cpp:60
 
-#if defined (_MSC_VER)
-
 // Traits specializations for RTScheduling::ThreadAction.
 
 RTScheduling::ThreadAction_ptr
@@ -287,8 +285,6 @@ TAO::Objref_Traits<RTScheduling::ThreadAction>::tao_marshal (
   return p->marshal (cdr);
 }
 
-#endif /* _MSC_VER */
-
 // Function pointer for collocation factory initialization.
 TAO::Collocation_Proxy_Broker *
 (*RTScheduling__TAO_ThreadAction_Proxy_Broker_Factory_function_pointer) (
@@ -404,8 +400,6 @@ namespace RTScheduling
 // TAO_IDL - Generated from
 // be/be_visitor_interface/interface_cs.cpp:60
 
-#if defined (_MSC_VER)
-
 // Traits specializations for RTScheduling::DistributableThread.
 
 RTScheduling::DistributableThread_ptr
@@ -439,8 +433,6 @@ TAO::Objref_Traits<RTScheduling::DistributableThread>::tao_marshal (
   return p->marshal (cdr);
 }
 
-#endif /* _MSC_VER */
-
 // Function pointer for collocation factory initialization.
 TAO::Collocation_Proxy_Broker *
 (*RTScheduling__TAO_DistributableThread_Proxy_Broker_Factory_function_pointer) (
@@ -559,8 +551,6 @@ namespace RTScheduling
 // TAO_IDL - Generated from
 // be/be_visitor_interface/interface_cs.cpp:60
 
-#if defined (_MSC_VER)
-
 // Traits specializations for RTScheduling::Current.
 
 RTScheduling::Current_ptr
@@ -594,8 +584,6 @@ TAO::Objref_Traits<RTScheduling::Current>::tao_marshal (
   return p->marshal (cdr);
 }
 
-#endif /* _MSC_VER */
-
 // Function pointer for collocation factory initialization.
 TAO::Collocation_Proxy_Broker *
 (*RTScheduling__TAO_Current_Proxy_Broker_Factory_function_pointer) (
@@ -1014,8 +1002,6 @@ namespace RTScheduling
 // TAO_IDL - Generated from
 // be/be_visitor_interface/interface_cs.cpp:60
 
-#if defined (_MSC_VER)
-
 // Traits specializations for RTScheduling::ResourceManager.
 
 RTScheduling::ResourceManager_ptr
@@ -1049,8 +1035,6 @@ TAO::Objref_Traits<RTScheduling::ResourceManager>::tao_marshal (
   return p->marshal (cdr);
 }
 
-#endif /* _MSC_VER */
-
 // Function pointer for collocation factory initialization.
 TAO::Collocation_Proxy_Broker *
 (*RTScheduling__TAO_ResourceManager_Proxy_Broker_Factory_function_pointer) (
@@ -1171,8 +1155,6 @@ namespace RTScheduling
 // TAO_IDL - Generated from
 // be/be_visitor_interface/interface_cs.cpp:60
 
-#if defined (_MSC_VER)
-
 // Traits specializations for RTScheduling::Scheduler.
 
 RTScheduling::Scheduler_ptr
@@ -1206,8 +1188,6 @@ TAO::Objref_Traits<RTScheduling::Scheduler>::tao_marshal (
   return p->marshal (cdr);
 }
 
-#endif /* _MSC_VER */
-
 // Function pointer for collocation factory initialization.
 TAO::Collocation_Proxy_Broker *
 (*RTScheduling__TAO_Scheduler_Proxy_Broker_Factory_function_pointer) (
diff --git a/TAO/tao/RTScheduling/RTSchedulerC.h b/TAO/tao/RTScheduling/RTSchedulerC.h
index fcd56be0e0f..ab68aa5903f 100644
--- a/TAO/tao/RTScheduling/RTSchedulerC.h
+++ b/TAO/tao/RTScheduling/RTSchedulerC.h
@@ -1096,8 +1096,6 @@ namespace RTScheduling
 // TAO_IDL - Generated from
 // be/be_visitor_traits.cpp:48
 
-#if defined (_MSC_VER)
-
 // Traits specializations.
 namespace TAO
 {
@@ -1208,8 +1206,6 @@ namespace TAO
 #endif /* end #if !defined */
 };
 
-#endif /* _MSC_VER */
-
 // TAO_IDL - Generated from
 // be/be_visitor_root/cdr_op.cpp:48
 
diff --git a/TAO/tao/Strategies/UIOP_Acceptor.h b/TAO/tao/Strategies/UIOP_Acceptor.h
index bd598cb7a92..ea588056f09 100644
--- a/TAO/tao/Strategies/UIOP_Acceptor.h
+++ b/TAO/tao/Strategies/UIOP_Acceptor.h
@@ -22,15 +22,14 @@
 #ifndef TAO_UIOP_ACCEPTOR_H
 #define TAO_UIOP_ACCEPTOR_H
 #include /**/ "ace/pre.h"
-
-#include "tao/Transport_Acceptor.h"
+#include "tao/orbconf.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 # if TAO_HAS_UIOP == 1
-
+#include "tao/Transport_Acceptor.h"
 #include "ace/Acceptor.h"
 #include "ace/LSOCK_Acceptor.h"
 #include "UIOP_Connection_Handler.h"