19 files changed, 26 insertions, 94 deletions
diff --git a/TAO/tao/IFR_Client/IFR_Base.pidl b/TAO/tao/IFR_Client/IFR_Base.pidl
index 02ee7037d5f..18cba35abea 100644
--- a/TAO/tao/IFR_Client/IFR_Base.pidl
+++ b/TAO/tao/IFR_Client/IFR_Base.pidl
@@ -19,8 +19,6 @@
  *        -Wb,export_include=ifr_client_export.h \
  *        -Wb,pre_include="ace/pre.h" \
  *        -Wb,post_include="ace/post.h" \
- *        -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL
- *        -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL
  *        IFR_Base.pidl
  *
  * Only the stub files are used in the TAO_IFR_Client library. The
@@ -52,8 +50,8 @@
 #ifndef _IFR_BASE_IDL_
 #define _IFR_BASE_IDL_
 
-#include "tao/orb_types.pidl"
-#include "tao/Typecode_types.pidl"
+#include <orb_types.pidl>
+#include <Typecode_types.pidl>
 
 module CORBA
 {
diff --git a/TAO/tao/IFR_Client/IFR_BaseC.cpp b/TAO/tao/IFR_Client/IFR_BaseC.cpp
index a684ebb3841..339d9aea34e 100644
--- a/TAO/tao/IFR_Client/IFR_BaseC.cpp
+++ b/TAO/tao/IFR_Client/IFR_BaseC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:293
 
 
-#include "tao/IFR_Client/IFR_BaseC.h"
+#include "IFR_BaseC.h"
 #include "tao/CDR.h"
 #include "tao/AnyTypeCode/orb_typesA.h"
 #include "tao/AnyTypeCode/Typecode_typesA.h"
@@ -60,14 +60,12 @@
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "tao/IFR_Client/IFR_BaseC.inl"
+#include "IFR_BaseC.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Arg traits specializations.
 namespace TAO
 {
@@ -8612,5 +8610,3 @@ CORBA::Boolean operator>> (
     (strm >> _tao_aggregate.version.out ()) &&
     (strm >> _tao_aggregate.type.out ());
 }
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/IFR_Client/IFR_BaseC.h b/TAO/tao/IFR_Client/IFR_BaseC.h
index 774ff7f019f..7d7e3171b2b 100644
--- a/TAO/tao/IFR_Client/IFR_BaseC.h
+++ b/TAO/tao/IFR_Client/IFR_BaseC.h
@@ -40,7 +40,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/IFR_Client/ifr_client_export.h"
+#include "ifr_client_export.h"
 #include "tao/AnyTypeCode/TypeCode.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Any.h"
@@ -72,8 +72,6 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // TAO_IDL - Generated from
 // be\be_visitor_root/root_ch.cpp:62
 
@@ -4107,10 +4105,8 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::TypeDesc
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:1136
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "tao/IFR_Client/IFR_BaseC.inl"
+#include "IFR_BaseC.inl"
 #endif /* defined INLINE */
 
 #if defined(_MSC_VER)
diff --git a/TAO/tao/IFR_Client/IFR_BaseC.inl b/TAO/tao/IFR_Client/IFR_BaseC.inl
index c7be5ed5427..8b69d04033d 100644
--- a/TAO/tao/IFR_Client/IFR_BaseC.inl
+++ b/TAO/tao/IFR_Client/IFR_BaseC.inl
@@ -29,8 +29,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ci.cpp:70
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 #if !defined (_CORBA_IROBJECT___CI_)
 #define _CORBA_IROBJECT___CI_
 
@@ -207,5 +205,3 @@ CORBA::TypedefDef::TypedefDef (
 }
 
 #endif /* end #if !defined */
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/IFR_Client/IFR_BaseS.h b/TAO/tao/IFR_Client/IFR_BaseS.h
index 0dd9ad297a6..1fea87667c7 100644
--- a/TAO/tao/IFR_Client/IFR_BaseS.h
+++ b/TAO/tao/IFR_Client/IFR_BaseS.h
@@ -33,7 +33,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/IFR_Client/IFR_BaseC.h"
+#include "IFR_BaseC.h"
 #include "tao/orb_typesS.h"
 #include "tao/Typecode_typesS.h"
 
@@ -57,8 +57,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_sh.cpp:49
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace POA_CORBA
 {
 
@@ -1250,8 +1248,6 @@ namespace POA_CORBA
 
 } // module CORBA
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/IFR_Client/IFR_Basic.pidl b/TAO/tao/IFR_Client/IFR_Basic.pidl
index c86b4e3a291..fa156e72b2d 100644
--- a/TAO/tao/IFR_Client/IFR_Basic.pidl
+++ b/TAO/tao/IFR_Client/IFR_Basic.pidl
@@ -18,8 +18,6 @@
  *          -Wb,export_include=ifr_client_export.h \
  *          -Wb,pre_include="ace/pre.h" \
  *          -Wb,post_include="ace/post.h" \
- *          -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL \
- *          -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL \
  *          IFR_Basic.pidl
  *
  *   Only the stub files are used in the TAO_IFR_Client library. The
@@ -51,7 +49,7 @@
 #define _IFR_BASIC_IDL_
 
 #include "tao/IFR_Client/IFR_Base.pidl"
-#include "tao/ParameterMode.pidl"
+#include "ParameterMode.pidl"
 
 module CORBA
 {
diff --git a/TAO/tao/IFR_Client/IFR_BasicC.cpp b/TAO/tao/IFR_Client/IFR_BasicC.cpp
index 73a0a993997..e9b3916a962 100644
--- a/TAO/tao/IFR_Client/IFR_BasicC.cpp
+++ b/TAO/tao/IFR_Client/IFR_BasicC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:293
 
 
-#include "tao/IFR_Client/IFR_BasicC.h"
+#include "IFR_BasicC.h"
 #include "tao/CDR.h"
 #include "tao/IFR_Client/IFR_BaseC.h"
 #include "tao/AnyTypeCode/orb_typesA.h"
@@ -62,14 +62,12 @@
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "tao/IFR_Client/IFR_BasicC.inl"
+#include "IFR_BasicC.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Arg traits specializations.
 namespace TAO
 {
@@ -13640,5 +13638,3 @@ CORBA::Boolean operator>> (
     
   return 1;
 }
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/IFR_Client/IFR_BasicC.h b/TAO/tao/IFR_Client/IFR_BasicC.h
index 268be82f290..06488fb9e77 100644
--- a/TAO/tao/IFR_Client/IFR_BasicC.h
+++ b/TAO/tao/IFR_Client/IFR_BasicC.h
@@ -40,7 +40,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/IFR_Client/ifr_client_export.h"
+#include "ifr_client_export.h"
 #include "tao/AnyTypeCode/TypeCode.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Any.h"
@@ -72,8 +72,6 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // TAO_IDL - Generated from 
 // be\be_visitor_root/root_ch.cpp:62
 
@@ -5689,10 +5687,8 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ExtLocal
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:1136
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "tao/IFR_Client/IFR_BasicC.inl"
+#include "IFR_BasicC.inl"
 #endif /* defined INLINE */
 
 #if defined(_MSC_VER)
diff --git a/TAO/tao/IFR_Client/IFR_BasicC.inl b/TAO/tao/IFR_Client/IFR_BasicC.inl
index 8f36b619375..6edd2c8a1a9 100644
--- a/TAO/tao/IFR_Client/IFR_BasicC.inl
+++ b/TAO/tao/IFR_Client/IFR_BasicC.inl
@@ -26,8 +26,6 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ci.cpp:70
 
@@ -891,5 +889,3 @@ CORBA::ExtLocalInterfaceDef::ExtLocalInterfaceDef (
 }
 
 #endif /* end #if !defined */
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp
index 2afc5ef4960..add9f0af0c5 100644
--- a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp
+++ b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#include "tao/IFR_Client/IFR_Client_Adapter_Impl.h"
-#include "tao/IFR_Client/IFR_BasicC.h"
+#include "IFR_Client_Adapter_Impl.h"
+#include "IFR_ExtendedC.h"
 
 #include "tao/AnyTypeCode/NVList.h"
 #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
@@ -15,8 +15,6 @@ ACE_RCSID (IFR_Client,
            IFR_Client_Adapter_Impl,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   template<>
@@ -216,8 +214,6 @@ TAO_IFR_Client_Adapter_Impl::Initializer (void)
   return ACE_Service_Config::process_directive (ace_svc_desc_TAO_IFR_Client_Adapter_Impl);
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 ACE_STATIC_SVC_DEFINE (
     TAO_IFR_Client_Adapter_Impl,
     ACE_TEXT ("Concrete_IFR_Client_Adapter"),
diff --git a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.h b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.h
index e3cfcd6b22d..bab2b9d2cb8 100644
--- a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.h
+++ b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.h
@@ -16,7 +16,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/IFR_Client/ifr_client_export.h"
+#include "ifr_client_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -26,8 +26,6 @@
 
 #include "ace/Service_Config.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_IFR_Client_Adapter_Impl
  *
@@ -81,15 +79,12 @@ public:
   static int Initializer (void);
 };
 
-static int
-TAO_Requires_IFR_Client_Initializer =
-  TAO_IFR_Client_Adapter_Impl::Initializer ();
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 ACE_STATIC_SVC_DECLARE (TAO_IFR_Client_Adapter_Impl)
 ACE_FACTORY_DECLARE (TAO_IFR_Client, TAO_IFR_Client_Adapter_Impl)
 
+static int
+TAO_Requires_IFR_Client_Initializer =
+  TAO_IFR_Client_Adapter_Impl::Initializer ();
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/IFR_Client/IFR_Components.pidl b/TAO/tao/IFR_Client/IFR_Components.pidl
index 7aa0102cd97..6bae6d0ebb0 100644
--- a/TAO/tao/IFR_Client/IFR_Components.pidl
+++ b/TAO/tao/IFR_Client/IFR_Components.pidl
@@ -18,8 +18,6 @@
  *          -Wb,export_include=ifr_client_export.h \
  *          -Wb,pre_include="ace/pre.h" \
  *          -Wb,post_include="ace/post.h" \
- *          -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL \
- *          -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL \
  *          IFR_Components.pidl
  *
  *   Only the stub files are used in the TAO_IFR_Client library. The
diff --git a/TAO/tao/IFR_Client/IFR_ComponentsC.cpp b/TAO/tao/IFR_Client/IFR_ComponentsC.cpp
index a6c2ff11eed..eab777756f6 100644
--- a/TAO/tao/IFR_Client/IFR_ComponentsC.cpp
+++ b/TAO/tao/IFR_Client/IFR_ComponentsC.cpp
@@ -30,7 +30,7 @@
 
 
 #include "tao/AnyTypeCode/orb_typesA.h"
-#include "tao/IFR_Client/IFR_ComponentsC.h"
+#include "IFR_ComponentsC.h"
 #include "tao/CDR.h"
 #include "tao/IFR_Client/IFR_ExtendedC.h"
 #include "tao/Invocation_Adapter.h"
@@ -58,15 +58,12 @@
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "tao/IFR_Client/IFR_ComponentsC.inl"
+#include "IFR_ComponentsC.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Arg traits specializations.
 namespace TAO
 {
@@ -7402,5 +7399,3 @@ CORBA::Boolean operator>> (
     (strm >> _tao_aggregate.attributes) &&
     (strm >> _tao_aggregate.type.out ());
 }
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/IFR_Client/IFR_ComponentsC.h b/TAO/tao/IFR_Client/IFR_ComponentsC.h
index f952df4b02e..f2efcd1c0c8 100644
--- a/TAO/tao/IFR_Client/IFR_ComponentsC.h
+++ b/TAO/tao/IFR_Client/IFR_ComponentsC.h
@@ -40,7 +40,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/IFR_Client/ifr_client_export.h"
+#include "ifr_client_export.h"
 #include "tao/AnyTypeCode/TypeCode.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/ORB.h"
@@ -69,8 +69,6 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // TAO_IDL - Generated from 
 // be\be_visitor_root/root_ch.cpp:62
 
@@ -3104,10 +3102,8 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::Componen
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:1136
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "tao/IFR_Client/IFR_ComponentsC.inl"
+#include "IFR_ComponentsC.inl"
 #endif /* defined INLINE */
 
 #if defined(_MSC_VER)
diff --git a/TAO/tao/IFR_Client/IFR_ComponentsC.inl b/TAO/tao/IFR_Client/IFR_ComponentsC.inl
index 58217d7f6d4..63e656401e4 100644
--- a/TAO/tao/IFR_Client/IFR_ComponentsC.inl
+++ b/TAO/tao/IFR_Client/IFR_ComponentsC.inl
@@ -25,7 +25,6 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ci.cpp:70
@@ -530,5 +529,3 @@ CORBA::ComponentIR::HomeDef::HomeDef (
 }
 
 #endif /* end #if !defined */
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/IFR_Client/IFR_Extended.pidl b/TAO/tao/IFR_Client/IFR_Extended.pidl
index 54675c6ef72..e0c06ce2c57 100644
--- a/TAO/tao/IFR_Client/IFR_Extended.pidl
+++ b/TAO/tao/IFR_Client/IFR_Extended.pidl
@@ -18,8 +18,6 @@
  *          -Wb,export_include=ifr_client_export.h \
  *          -Wb,pre_include="ace/pre.h" \
  *          -Wb,post_include="ace/post.h" \
- *          -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL \
- *          -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL \
  *          IFR_Extended.pidl
  *
  *   Only the stub files are used in the TAO_IFR_Client library. The
diff --git a/TAO/tao/IFR_Client/IFR_ExtendedC.cpp b/TAO/tao/IFR_Client/IFR_ExtendedC.cpp
index 934ef4659d8..6e6d014a7bd 100644
--- a/TAO/tao/IFR_Client/IFR_ExtendedC.cpp
+++ b/TAO/tao/IFR_Client/IFR_ExtendedC.cpp
@@ -32,7 +32,7 @@
 #include "tao/AnyTypeCode/VisibilityA.h"
 #include "tao/AnyTypeCode/ValueModifierA.h"
 #include "tao/AnyTypeCode/orb_typesA.h"
-#include "tao/IFR_Client/IFR_ExtendedC.h"
+#include "IFR_ExtendedC.h"
 #include "tao/CDR.h"
 #include "tao/IFR_Client/IFR_BasicC.h"
 #include "tao/Invocation_Adapter.h"
@@ -60,14 +60,12 @@
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "tao/IFR_Client/IFR_ExtendedC.inl"
+#include "IFR_ExtendedC.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Arg traits specializations.
 namespace TAO
 {
@@ -4249,5 +4247,3 @@ CORBA::Boolean operator>> (
     
   return 1;
 }
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/IFR_Client/IFR_ExtendedC.h b/TAO/tao/IFR_Client/IFR_ExtendedC.h
index 45d3c8e1a9b..e432cce0663 100644
--- a/TAO/tao/IFR_Client/IFR_ExtendedC.h
+++ b/TAO/tao/IFR_Client/IFR_ExtendedC.h
@@ -40,7 +40,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/IFR_Client/ifr_client_export.h"
+#include "ifr_client_export.h"
 #include "tao/AnyTypeCode/TypeCode.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/ORB.h"
@@ -71,8 +71,6 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // TAO_IDL - Generated from 
 // be\be_visitor_root/root_ch.cpp:62
 
@@ -1553,10 +1551,8 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ValueBox
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:1136
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "tao/IFR_Client/IFR_ExtendedC.inl"
+#include "IFR_ExtendedC.inl"
 #endif /* defined INLINE */
 
 #if defined(_MSC_VER)
diff --git a/TAO/tao/IFR_Client/IFR_ExtendedC.inl b/TAO/tao/IFR_Client/IFR_ExtendedC.inl
index ee480033bf6..21c51c95edd 100644
--- a/TAO/tao/IFR_Client/IFR_ExtendedC.inl
+++ b/TAO/tao/IFR_Client/IFR_ExtendedC.inl
@@ -25,7 +25,6 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ci.cpp:70
@@ -206,5 +205,3 @@ CORBA::ValueBoxDef::ValueBoxDef (
 }
 
 #endif /* end #if !defined */
-
-TAO_END_VERSIONED_NAMESPACE_DECL