ChangeLogTag:Fri Dec 16 18:06:27 2005 Ossama Othman <ossama@dre.vanderbilt.edu>

55 files changed, 258 insertions, 46 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 005e08d99d9..3f072f6805a 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,83 @@
+Fri Dec 16 18:06:27 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+	* TAO_IDL/be/be_global.cpp:
+	* TAO_IDL/be_include/be_global.h:
+	* TAO_IDL/driver/drv_args.cpp:
+
+	  Added missing code that sets versioned namespace opening and
+	  closing text.
+
+	  Disable some versioned namespace code when versioned namespaces
+	  are not enabled in ACE and TAO.
+
+	* TAO_IDL/be/be_visitor_union/any_op_ch.cpp:
+
+	  Fixed typo that caused generated versioned namespace to be
+	  reopened before it was closed.
+
+	* orbsvcs/orbsvcs/AV.mpc:
+	* orbsvcs/orbsvcs/CosConcurrency.mpc:
+	* orbsvcs/orbsvcs/CosEvent.mpc:
+	* orbsvcs/orbsvcs/CosLifeCycle.mpc:
+	* orbsvcs/orbsvcs/CosLoadBalancing.mpc:
+	* orbsvcs/orbsvcs/CosNaming.mpc:
+	* orbsvcs/orbsvcs/CosNotification.mpc:
+	* orbsvcs/orbsvcs/CosProperty.mpc:
+	* orbsvcs/orbsvcs/CosTime.mpc:
+	* orbsvcs/orbsvcs/CosTrading.mpc:
+	* orbsvcs/orbsvcs/DsEventLogAdmin.mpc:
+	* orbsvcs/orbsvcs/DsLogAdmin.mpc:
+	* orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc:
+	* orbsvcs/orbsvcs/FTORB.mpc:
+	* orbsvcs/orbsvcs/FaultTolerance.mpc:
+	* orbsvcs/orbsvcs/FtRtEvent.mpc:
+	* orbsvcs/orbsvcs/HTIOP.mpc:
+	* orbsvcs/orbsvcs/PortableGroup.mpc:
+	* orbsvcs/orbsvcs/RTCosScheduling.mpc:
+	* orbsvcs/orbsvcs/RTEvent.mpc:
+	* orbsvcs/orbsvcs/RTEventLogAdmin.mpc:
+	* orbsvcs/orbsvcs/RTSched.mpc:
+	* orbsvcs/orbsvcs/RT_Notification.mpc:
+	* orbsvcs/orbsvcs/SSLIOP.mpc:
+	* orbsvcs/orbsvcs/Security.mpc:
+	* orbsvcs/orbsvcs/Svc_Utils.mpc:
+
+	  Core orbsvcs stubs/skeletons must have ability to support
+	  versioned namespaces.  IDL-capable MPC projects now inherit from
+	  the "tao_versioning_idl_defaults" MPC base project.
+
+	* tao/CONV_FRAME.pidl:
+	* tao/CharSeq.pidl:
+	* tao/Current.pidl:
+	* tao/Domain.pidl:
+	* tao/DoubleSeq.pidl:
+	* tao/FloatSeq.pidl:
+	* tao/GIOP.pidl:
+	* tao/IIOP.pidl:
+	* tao/AnyTypeCode/AnySeq.pidl:
+	* tao/AnyTypeCode/Bounds.pidl:
+	* tao/AnyTypeCode/Dynamic.pidl:
+	* tao/AnyTypeCode/Dynamic_Parameter.pidl:
+	* tao/AnyTypeCode/ValueModifier.pidl:
+	* tao/AnyTypeCode/Visibility.pidl:
+	* tao/BiDir_GIOP/BiDirPolicy.pidl:
+	* tao/CSD_Framework/CSD_Framework.pidl:
+	* tao/CodecFactory/IOP_Codec.pidl:
+	* tao/CodecFactory/IOP_Codec_include.pidl:
+	* tao/DynamicAny/DynamicAny.pidl:
+	* tao/IFR_Client/IFR_Base.pidl:
+	* tao/IFR_Client/IFR_Basic.pidl:
+	* tao/IFR_Client/IFR_Components.pidl:
+	* tao/IFR_Client/IFR_Extended.pidl:
+
+	  Added versioned namespace related TAO_IDL command line options
+	  to the stub/skeleton generation documentation.
+
+	* tests/Param_Test/results.h:
+
+	  Wrap forward declaration of class in CORBA namespace within a
+	  TAO versioned namespace since the core TAO library does so.
+
 Thu Dec 15 16:19:48 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
 	* TAO_IDL/be/be_codegen.cpp:
diff --git a/TAO/TAO_IDL/be/be_global.cpp b/TAO/TAO_IDL/be/be_global.cpp
index 9eb2c7031c2..0a2c93b5867 100644
--- a/TAO/TAO_IDL/be/be_global.cpp
+++ b/TAO/TAO_IDL/be/be_global.cpp
@@ -47,8 +47,13 @@ BE_GlobalData::BE_GlobalData (void)
     post_include_ (0),
     core_versioning_begin_ ("\nTAO_BEGIN_VERSIONED_NAMESPACE_DECL\n"),
     core_versioning_end_   ("\nTAO_END_VERSIONED_NAMESPACE_DECL\n"),
+#if (defined (ACE_HAS_VERSIONED_NAMESPACE)      \
+     && ACE_HAS_VERSIONED_NAMESPACE == 1)       \
+  || (defined (TAO_HAS_VERSIONED_NAMESPACE)      \
+      && TAO_HAS_VERSIONED_NAMESPACE == 1)
     versioning_begin_ (),
     versioning_end_ (),
+#endif  /* ACE_HAS_VERSIONED_NAMESPACE || TAO_HAS_VERSIONED_NAMESPACE */
     client_hdr_ending_ (ACE::strnew ("C.h")),
     client_stub_ending_ (ACE::strnew ("C.cpp")),
     client_inline_ending_ (ACE::strnew ("C.inl")),
@@ -566,6 +571,10 @@ BE_GlobalData::post_include (const char *s)
   this->post_include_ = ACE_OS::strdup (s);
 }
 
+#if (defined (ACE_HAS_VERSIONED_NAMESPACE)      \
+     && ACE_HAS_VERSIONED_NAMESPACE == 1)       \
+  || (defined (TAO_HAS_VERSIONED_NAMESPACE)      \
+     && TAO_HAS_VERSIONED_NAMESPACE == 1)
 void
 BE_GlobalData::versioning_begin (const char * s)
 {
@@ -576,11 +585,20 @@ BE_GlobalData::versioning_begin (const char * s)
 
   this->core_versioning_end_ += this->versioning_begin_;  // Yes, "begin".
 }
+#endif  /* ACE_HAS_VERSIONED_NAMESPACE || TAO_HAS_VERSIONED_NAMESPACE */
 
 const char *
 BE_GlobalData::versioning_begin (void) const
 {
+#if (defined (ACE_HAS_VERSIONED_NAMESPACE)      \
+     && ACE_HAS_VERSIONED_NAMESPACE == 1)       \
+  || (defined (TAO_HAS_VERSIONED_NAMESPACE)      \
+     && TAO_HAS_VERSIONED_NAMESPACE == 1)
   return this->versioning_begin_.c_str ();
+#else
+  static char const empty_string[] = "";
+  return empty_string;
+#endif  /* ACE_HAS_VERSIONED_NAMESPACE || TAO_HAS_VERSIONED_NAMESPACE */
 }
 
 const char *
@@ -589,6 +607,10 @@ BE_GlobalData::core_versioning_begin (void) const
   return this->core_versioning_begin_.c_str ();
 }
 
+#if (defined (ACE_HAS_VERSIONED_NAMESPACE)      \
+     && ACE_HAS_VERSIONED_NAMESPACE == 1)       \
+  || (defined (TAO_HAS_VERSIONED_NAMESPACE)      \
+     && TAO_HAS_VERSIONED_NAMESPACE == 1)
 void
 BE_GlobalData::versioning_end (const char * s)
 {
@@ -601,11 +623,20 @@ BE_GlobalData::versioning_end (const char * s)
     this->versioning_end_  // Yes, "end".
     + this->core_versioning_begin_;  // Initialized in constructor.
 }
+#endif  /* ACE_HAS_VERSIONED_NAMESPACE || TAO_HAS_VERSIONED_NAMESPACE */
 
 const char *
 BE_GlobalData::versioning_end (void) const
 {
+#if (defined (ACE_HAS_VERSIONED_NAMESPACE)      \
+     && ACE_HAS_VERSIONED_NAMESPACE == 1)       \
+  || (defined (TAO_HAS_VERSIONED_NAMESPACE)      \
+     && TAO_HAS_VERSIONED_NAMESPACE == 1)
   return this->versioning_end_.c_str ();
+#else
+  static char const empty_string[] = "";
+  return empty_string;
+#endif  /* ACE_HAS_VERSIONED_NAMESPACE || TAO_HAS_VERSIONED_NAMESPACE */
 }
 
 const char *
@@ -1836,18 +1867,26 @@ BE_GlobalData::parse_args (long &i, char **av)
 void
 BE_GlobalData::prep_be_arg (char *s)
 {
-  const char arg_macro[] = "export_macro=";
-  const char arg_include[] = "export_include=";
-  const char skel_arg_macro[] = "skel_export_macro=";
-  const char skel_arg_include[] = "skel_export_include=";
-  const char stub_arg_macro[] = "stub_export_macro=";
-  const char stub_arg_include[] = "stub_export_include=";
-  const char anyop_arg_macro[] = "anyop_export_macro=";
-  const char anyop_arg_include[] = "anyop_export_include=";
-  const char arg_pch_include[] = "pch_include=";
-  const char arg_pre_include[] = "pre_include=";
-  const char arg_post_include[] = "post_include=";
-  const char obv_opt_accessor[] = "obv_opt_accessor";
+  static const char arg_macro[]         = "export_macro=";
+  static const char arg_include[]       = "export_include=";
+  static const char skel_arg_macro[]    = "skel_export_macro=";
+  static const char skel_arg_include[]  = "skel_export_include=";
+  static const char stub_arg_macro[]    = "stub_export_macro=";
+  static const char stub_arg_include[]  = "stub_export_include=";
+  static const char anyop_arg_macro[]   = "anyop_export_macro=";
+  static const char anyop_arg_include[] = "anyop_export_include=";
+  static const char arg_pch_include[]   = "pch_include=";
+  static const char arg_pre_include[]   = "pre_include=";
+  static const char arg_post_include[]  = "post_include=";
+  static const char obv_opt_accessor[]  = "obv_opt_accessor";
+
+#if (defined (ACE_HAS_VERSIONED_NAMESPACE)      \
+     && ACE_HAS_VERSIONED_NAMESPACE == 1)       \
+  || (defined (TAO_HAS_VERSIONED_NAMESPACE)      \
+      && TAO_HAS_VERSIONED_NAMESPACE == 1)
+  static const char arg_versioning_begin[]  = "versioning_begin=";
+  static const char arg_versioning_end[]    = "versioning_end=";
+#endif  /* ACE_HAS_VERSIONED_NAMESPACE || TAO_HAS_VERSIONED_NAMESPACE */
 
   char* last = 0;
 
@@ -1916,6 +1955,21 @@ BE_GlobalData::prep_be_arg (char *s)
         {
           be_global->obv_opt_accessor (1);
         }
+#if (defined (ACE_HAS_VERSIONED_NAMESPACE)      \
+     && ACE_HAS_VERSIONED_NAMESPACE == 1)       \
+  || (defined (TAO_HAS_VERSIONED_NAMESPACE)      \
+      && TAO_HAS_VERSIONED_NAMESPACE == 1)
+      else if (ACE_OS::strstr (arg, arg_versioning_begin) == arg)
+        {
+          char const * const val = arg + sizeof (arg_versioning_begin) - 1;
+          be_global->versioning_begin (val);
+        }
+      else if (ACE_OS::strstr (arg, arg_versioning_end) == arg)
+        {
+          char const * const val = arg + sizeof (arg_versioning_end) - 1;
+          be_global->versioning_end (val);
+        }
+#endif  /* ACE_HAS_VERSIONED_NAMESPACE || TAO_HAS_VERSIONED_NAMESPACE */
       else
         {
           ACE_ERROR ((LM_ERROR,
diff --git a/TAO/TAO_IDL/be/be_visitor_union/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union/any_op_ch.cpp
index d36a5155638..897acca7ad6 100644
--- a/TAO/TAO_IDL/be/be_visitor_union/any_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union/any_op_ch.cpp
@@ -63,7 +63,7 @@ be_visitor_union_any_op_ch::visit_union (be_union *node)
   *os << macro << " ::CORBA::Boolean operator>>= (const ::CORBA::Any &, const "
       << node->name () << " *&);";
 
-  *os << be_global->core_versioning_begin () << be_nl;
+  *os << be_global->core_versioning_end () << be_nl;
 
   if (this->visit_scope (node) == -1)
     {
diff --git a/TAO/TAO_IDL/be_include/be_global.h b/TAO/TAO_IDL/be_include/be_global.h
index e27e4dd5b3e..33e8d5c4df9 100644
--- a/TAO/TAO_IDL/be_include/be_global.h
+++ b/TAO/TAO_IDL/be_include/be_global.h
@@ -206,9 +206,14 @@ public:
   // set the name of the include file to be put at the bottom of every
   // header file.
 
+#if (defined (ACE_HAS_VERSIONED_NAMESPACE)      \
+     && ACE_HAS_VERSIONED_NAMESPACE == 1)       \
+  || (defined (TAO_HAS_VERSIONED_NAMESPACE)      \
+     && TAO_HAS_VERSIONED_NAMESPACE == 1)
   /// Set text that opens a "versioned" namespace.
   void versioning_begin (const char* s);
-  
+#endif  /* ACE_HAS_VERSIONED_NAMESPACE || TAO_HAS_VERSIONED_NAMESPACE */  
+
   /// Get text that opens a "versioned" namespace.
   const char * versioning_begin (void) const;
 
@@ -216,9 +221,14 @@ public:
   /// related code.
   const char * core_versioning_begin (void) const;
 
+#if (defined (ACE_HAS_VERSIONED_NAMESPACE)      \
+     && ACE_HAS_VERSIONED_NAMESPACE == 1)       \
+  || (defined (TAO_HAS_VERSIONED_NAMESPACE)      \
+     && TAO_HAS_VERSIONED_NAMESPACE == 1)
   /// Set text that closes a "versioned" namespace.
   void versioning_end (const char* s);
-  
+#endif  /* ACE_HAS_VERSIONED_NAMESPACE || TAO_HAS_VERSIONED_NAMESPACE */
+
   /// Get text that closes a "versioned" namespace.
   const char * versioning_end (void) const;
 
@@ -542,19 +552,24 @@ private:
   char* pre_include_;
   char* post_include_;
 
-  /// Text that opens a "versioned" namespace for core TAO/orbsvcs
+  /// Text that opens a "versioned" namespace for core TAO and orbsvcs
   /// related code.
   ACE_CString core_versioning_begin_;
 
-  /// Text that closes a "versioned" namespace for core TAO/orbsvcs
-  /// related code.
+  /// Text that closes a "versioned" namespace for core TAO and
+  /// orbsvcs related code.
   ACE_CString core_versioning_end_;
-  
+
+#if (defined (ACE_HAS_VERSIONED_NAMESPACE)      \
+     && ACE_HAS_VERSIONED_NAMESPACE == 1)       \
+  || (defined (TAO_HAS_VERSIONED_NAMESPACE)      \
+     && TAO_HAS_VERSIONED_NAMESPACE == 1)  
   /// Text that opens a "versioned" namepace.
   ACE_CString versioning_begin_;
 
   /// Text that closes a "versioned" namepace.
   ACE_CString versioning_end_;
+#endif  /* ACE_HAS_VERSIONED_NAMESPACE || TAO_HAS_VERSIONED_NAMESPACE */
 
   // Client's header file name ending. Default is "C.h".
   char* client_hdr_ending_;
diff --git a/TAO/TAO_IDL/driver/drv_args.cpp b/TAO/TAO_IDL/driver/drv_args.cpp
index 46b0ccb5c36..df41cf50ab3 100644
--- a/TAO/TAO_IDL/driver/drv_args.cpp
+++ b/TAO/TAO_IDL/driver/drv_args.cpp
@@ -246,6 +246,10 @@ DRV_usage (void)
       ACE_TEXT (" -Wb,obv_opt_accessor\t\t\t\toptimizes access to base class ")
       ACE_TEXT ("data in valuetypes\n")
     ));
+#if (defined (ACE_HAS_VERSIONED_NAMESPACE)      \
+     && ACE_HAS_VERSIONED_NAMESPACE == 1)       \
+  || (defined (TAO_HAS_VERSIONED_NAMESPACE)      \
+     && TAO_HAS_VERSIONED_NAMESPACE == 1)
   ACE_DEBUG ((
       LM_DEBUG,
       ACE_TEXT (" -Wb,versioning_begin\t\t\tSet text that opens a ")
@@ -256,6 +260,7 @@ DRV_usage (void)
       ACE_TEXT (" -Wb,versioning_end\t\t\tSet text that closes a ")
       ACE_TEXT ("a \"versioned\" namespace\n")
     ));
+#endif  /* ACE_HAS_VERSIONED_NAMESPACE || TAO_HAS_VERSIONED_NAMESPACE */
   ACE_DEBUG ((
       LM_DEBUG,
       ACE_TEXT (" -Yp,path\t\tdefines location of preprocessor\n")
diff --git a/TAO/orbsvcs/orbsvcs/AV.mpc b/TAO/orbsvcs/orbsvcs/AV.mpc
index 1ebca30831d..a897ccef18e 100644
--- a/TAO/orbsvcs/orbsvcs/AV.mpc
+++ b/TAO/orbsvcs/orbsvcs/AV.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(AV) : orbsvcslib, core, property, naming, qos {
+project(AV) : orbsvcslib, core, property, naming, qos, tao_versioning_idl_defaults {
   avoids       += ace_for_tao
   sharedname    = TAO_AV
   idlflags     += -Wb,export_macro=TAO_AV_Export -Wb,export_include=orbsvcs/AV/AV_export.h
diff --git a/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc b/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc
index 3f313dae277..6ef0fc8fc12 100644
--- a/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(CosConcurrency) : orbsvcslib, core, portableserver {
+project(CosConcurrency) : orbsvcslib, core, portableserver, tao_versioning_idl_defaults {
   sharedname   = TAO_CosConcurrency
   idlflags    += -Wb,export_macro=TAO_Concurrency_Export -Wb,export_include=orbsvcs/Concurrency/concurrency_export.h
   dynamicflags = TAO_CONCURRENCY_BUILD_DLL
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent.mpc b/TAO/orbsvcs/orbsvcs/CosEvent.mpc
index 51c4334ea06..54295b83d70 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosEvent.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project (CosEvent_IDL) : orbsvcslib, core, minimum_corba, ec_typed_events_idl {
+project (CosEvent_IDL) : orbsvcslib, core, minimum_corba, ec_typed_events_idl, tao_versioning_idl_defaults {
 
   idlflags    += -Wb,stub_export_macro=TAO_Event_Export -Wb,stub_export_include=orbsvcs/CosEvent/event_export.h -Wb,skel_export_macro=TAO_Event_Skel_Export -Wb,skel_export_include=orbsvcs/CosEvent/event_skel_export.h
 
diff --git a/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc b/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc
index 5aabc0ad101..e6ceedced03 100644
--- a/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(CosLifeCycle) : orbsvcslib, core, naming, portableserver {
+project(CosLifeCycle) : orbsvcslib, core, naming, portableserver, tao_versioning_idl_defaults {
   sharedname   = TAO_CosLifeCycle
   idlflags    += -Wb,export_macro=TAO_LifeCycle_Export -Wb,export_include=orbsvcs/LifeCycle/lifecycle_export.h
   dynamicflags = TAO_LIFECYCLE_BUILD_DLL
diff --git a/TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc b/TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc
index bb3f07b2480..7ea375e45af 100644
--- a/TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : orbsvcslib, core, naming, iormanip, portablegroup, ami, minimum_corba, pi, pi_server, iorinterceptor {
+project : orbsvcslib, core, naming, iormanip, portablegroup, ami, minimum_corba, pi, pi_server, iorinterceptor, tao_versioning_idl_defaults {
   sharedname   = TAO_CosLoadBalancing
   idlflags    += -Wb,export_macro=TAO_LoadBalancing_Export -Wb,export_include=orbsvcs/LoadBalancing/LoadBalancing_export.h
   dynamicflags = TAO_LOADBALANCING_BUILD_DLL
diff --git a/TAO/orbsvcs/orbsvcs/CosNaming.mpc b/TAO/orbsvcs/orbsvcs/CosNaming.mpc
index e73440e773b..e7a21747d2e 100644
--- a/TAO/orbsvcs/orbsvcs/CosNaming.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosNaming.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(CosNaming_IDL) : orbsvcslib, core {
+project(CosNaming_IDL) : orbsvcslib, core, tao_versioning_idl_defaults {
 
   custom_only =	1
 
diff --git a/TAO/orbsvcs/orbsvcs/CosNotification.mpc b/TAO/orbsvcs/orbsvcs/CosNotification.mpc
index 5c7c8eadebc..6a1229bcc08 100644
--- a/TAO/orbsvcs/orbsvcs/CosNotification.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosNotification.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(CosNotification_IDL) : orbsvcslib, core, event {
+project(CosNotification_IDL) : orbsvcslib, core, event, tao_versioning_idl_defaults {
 
   custom_only = 1
 
diff --git a/TAO/orbsvcs/orbsvcs/CosProperty.mpc b/TAO/orbsvcs/orbsvcs/CosProperty.mpc
index e4aa9fbbfde..d95bad60654 100644
--- a/TAO/orbsvcs/orbsvcs/CosProperty.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosProperty.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(CosProperty) : orbsvcslib, core, portableserver {
+project(CosProperty) : orbsvcslib, core, portableserver, tao_versioning_idl_defaults {
   sharedname   = TAO_CosProperty
   idlflags    += -Wb,export_macro=TAO_Property_Export -Wb,export_include=orbsvcs/Property/property_export.h
   dynamicflags = TAO_PROPERTY_BUILD_DLL
diff --git a/TAO/orbsvcs/orbsvcs/CosTime.mpc b/TAO/orbsvcs/orbsvcs/CosTime.mpc
index a20d078718e..edaca169bb8 100644
--- a/TAO/orbsvcs/orbsvcs/CosTime.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosTime.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(CosTime) : orbsvcslib, svc_utils, core, portableserver {
+project(CosTime) : orbsvcslib, svc_utils, core, portableserver, tao_versioning_idl_defaults {
   sharedname   = TAO_CosTime
   idlflags    += -Wb,export_macro=TAO_Time_Export -Wb,export_include=orbsvcs/Time/time_export.h
   dynamicflags = TAO_TIME_BUILD_DLL
diff --git a/TAO/orbsvcs/orbsvcs/CosTrading.mpc b/TAO/orbsvcs/orbsvcs/CosTrading.mpc
index e42e484b382..1f28f10dd0c 100644
--- a/TAO/orbsvcs/orbsvcs/CosTrading.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosTrading.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(CosTrading_IDL) : orbsvcslib, core {
+project(CosTrading_IDL) : orbsvcslib, core, tao_versioning_idl_defaults {
 
   custom_only = 1
 
diff --git a/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc
index 246397fd193..cba1aa837a6 100644
--- a/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc
+++ b/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc
@@ -1,9 +1,9 @@
 // -*- MPC -*-
 // $Id$
 
-project(DsEventLogAdmin_IDL) : orbsvcslib, core, dslogadmin, event {
+project(DsEventLogAdmin_IDL) : orbsvcslib, core, dslogadmin, event, tao_versioning_idl_defaults {
 
-  custom_only = 1
+custom_only = 1
 
   idlflags += -Wb,stub_export_macro=TAO_EventLog_Export -Wb,stub_export_include=orbsvcs/Log/eventlog_export.h -Wb,skel_export_macro=TAO_EventLog_Skel_Export -Wb,skel_export_include=orbsvcs/Log/eventlog_skel_export.h
 
diff --git a/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc
index 469f7720e3a..1b0015c484b 100644
--- a/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc
+++ b/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(DsLogAdmin_IDL) : orbsvcslib, core {
+project(DsLogAdmin_IDL) : orbsvcslib, core, tao_versioning_idl_defaults {
 
   custom_only = 1
 
diff --git a/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc
index ddfb9af7cc6..e55a9bd68cb 100644
--- a/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc
+++ b/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(DsNotifyLogAdmin_IDL) : orbsvcslib, core, dslogadmin, dseventlogadmin, event, notification {
+project(DsNotifyLogAdmin_IDL) : orbsvcslib, core, dslogadmin, dseventlogadmin, event, notification, tao_versioning_idl_defaults {
 
   custom_only = 1
 
diff --git a/TAO/orbsvcs/orbsvcs/FTORB.mpc b/TAO/orbsvcs/orbsvcs/FTORB.mpc
index c1be2de2ded..8254fb8f2de 100644
--- a/TAO/orbsvcs/orbsvcs/FTORB.mpc
+++ b/TAO/orbsvcs/orbsvcs/FTORB.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(FTORB_Utils) : orbsvcslib, core, iormanip, portableserver, portablegroup, minimum_corba {
+project(FTORB_Utils) : orbsvcslib, core, iormanip, portableserver, portablegroup, minimum_corba, tao_versioning_idl_defaults {
   sharedname   = TAO_FTORB_Utils
   idlflags    += -Wb,skel_export_include=tao/PortableServer/PolicyS.h
   dynamicflags = TAO_FT_ORB_UTILS_BUILD_DLL
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance.mpc b/TAO/orbsvcs/orbsvcs/FaultTolerance.mpc
index 7ea57b8282e..0b6911d2473 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance.mpc
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(FaultTolerance): orbsvcslib, core, pi, pi_server, notification, ftorb, portablegroup, minimum_corba {
+project(FaultTolerance): orbsvcslib, core, pi, pi_server, notification, ftorb, portablegroup, minimum_corba, tao_versioning_idl_defaults {
   sharedname   = TAO_FaultTolerance
   idlflags    += -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h
   dynamicflags = TAO_FT_BUILD_DLL
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc b/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc
index 027eb1dd61c..f8a76262813 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project (FtRtEvent) : orbsvcslib, core, ftorbutils, rtevent_serv, naming, minimum_corba, pi_server {
+project (FtRtEvent) : orbsvcslib, core, ftorbutils, rtevent_serv, naming, minimum_corba, pi_server, tao_versioning_idl_defaults {
   sharedname   = TAO_FtRtEvent
 
   idlflags     += -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP.mpc b/TAO/orbsvcs/orbsvcs/HTIOP.mpc
index 7db3241bbed..4edc739faa9 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP.mpc
+++ b/TAO/orbsvcs/orbsvcs/HTIOP.mpc
@@ -2,7 +2,7 @@
 //
 // $Id$
 
-project : htbp, orbsvcslib, core {
+project : htbp, orbsvcslib, core, tao_versioning_idl_defaults {
   sharedname   = TAO_HTIOP
   idlflags    += -Wb,export_macro=HTIOP_Export -Wb,export_include=orbsvcs/HTIOP/HTIOP_Export.h
   dynamicflags = HTIOP_BUILD_DLL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup.mpc b/TAO/orbsvcs/orbsvcs/PortableGroup.mpc
index 62979dc481d..b69114fe016 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup.mpc
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(PortableGroup) : orbsvcslib, core, naming, iormanip, messaging, minimum_corba {
+project(PortableGroup) : orbsvcslib, core, naming, iormanip, messaging, minimum_corba, tao_versioning_idl_defaults {
   sharedname   = TAO_PortableGroup
   idlflags    += -Wb,export_macro=TAO_PortableGroup_Export \
                  -Wb,export_include=orbsvcs/PortableGroup/portablegroup_export.h
diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling.mpc b/TAO/orbsvcs/orbsvcs/RTCosScheduling.mpc
index 117fed37089..0350cf8953f 100644
--- a/TAO/orbsvcs/orbsvcs/RTCosScheduling.mpc
+++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(RTCosScheduling) : orbsvcslib, core, rtportableserver, interceptors, codecfactory {
+project(RTCosScheduling) : orbsvcslib, core, rtportableserver, interceptors, codecfactory, tao_versioning_idl_defaults {
   sharedname    = TAO_RTCosScheduling
   idlflags     += -Gd -Wb,export_macro=TAO_RTCosScheduling_Export -Wb,export_include=orbsvcs/RTCosScheduling/RTCosScheduling_export.h
   dynamicflags += TAO_RTCOSSCHEDULING_BUILD_DLL
diff --git a/TAO/orbsvcs/orbsvcs/RTEvent.mpc b/TAO/orbsvcs/orbsvcs/RTEvent.mpc
index b42e56b56ab..0b35b3f184b 100644
--- a/TAO/orbsvcs/orbsvcs/RTEvent.mpc
+++ b/TAO/orbsvcs/orbsvcs/RTEvent.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(RTEvent) : orbsvcslib, core, svc_utils {
+project(RTEvent) : orbsvcslib, core, svc_utils, tao_versioning_idl_defaults {
   sharedname   = TAO_RTEvent
   idlflags    += -Wb,stub_export_macro=TAO_RTEvent_Export -Wb,stub_export_include=orbsvcs/Event/event_export.h -Wb,skel_export_macro=TAO_RTEvent_Skel_Export -Wb,skel_export_include=orbsvcs/Event/event_skel_export.h
   dynamicflags = TAO_RTEVENT_BUILD_DLL
diff --git a/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc
index 88a06a5c1d1..9eea66b5673 100644
--- a/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc
+++ b/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(RTEventLogAdmin) : orbsvcslib, core, naming, rtevent_serv, rtsched, dslogadmin_serv {
+project(RTEventLogAdmin) : orbsvcslib, core, naming, rtevent_serv, rtsched, dslogadmin_serv, tao_versioning_idl_defaults {
   sharedname   = TAO_RTEventLogAdmin
   idlflags    += -Wb,export_macro=TAO_RTEventLog_Export -Wb,export_include=orbsvcs/Log/rteventlog_export.h
   dynamicflags = TAO_RTEVENTLOG_BUILD_DLL
diff --git a/TAO/orbsvcs/orbsvcs/RTSched.mpc b/TAO/orbsvcs/orbsvcs/RTSched.mpc
index ef34a2ec2a6..4659069665c 100644
--- a/TAO/orbsvcs/orbsvcs/RTSched.mpc
+++ b/TAO/orbsvcs/orbsvcs/RTSched.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(RTSched) : orbsvcslib, core, naming, portableserver, svc_utils {
+project(RTSched) : orbsvcslib, core, naming, portableserver, svc_utils, tao_versioning_idl_defaults {
   sharedname   = TAO_RTSched
   idlflags    += -Wb,export_macro=TAO_RTSched_Export -Wb,export_include=orbsvcs/Sched/sched_export.h
   dynamicflags = TAO_RTSCHED_BUILD_DLL
diff --git a/TAO/orbsvcs/orbsvcs/RT_Notification.mpc b/TAO/orbsvcs/orbsvcs/RT_Notification.mpc
index fe038ea6723..f43b2825357 100644
--- a/TAO/orbsvcs/orbsvcs/RT_Notification.mpc
+++ b/TAO/orbsvcs/orbsvcs/RT_Notification.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(RT_Notification) : orbsvcslib, core, rtcorba, notification_serv {
+project(RT_Notification) : orbsvcslib, core, rtcorba, notification_serv, tao_versioning_idl_defaults {
   sharedname   = TAO_RT_Notification
   idlflags    += -Wb,export_macro=TAO_RT_Notify_Export -Wb,export_include=orbsvcs/Notify/rt_notify_export.h
   dynamicflags = TAO_RT_NOTIFY_BUILD_DLL
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP.mpc b/TAO/orbsvcs/orbsvcs/SSLIOP.mpc
index 1a0c75461a4..a6a9f195f5f 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP.mpc
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP.mpc
@@ -2,7 +2,7 @@
 //
 // $Id$
 
-project(SSLIOP) : orbsvcslib, core, security, ssl, pi_server, interceptors {
+project(SSLIOP) : orbsvcslib, core, security, ssl, pi_server, interceptors, tao_versioning_idl_defaults {
   sharedname   = TAO_SSLIOP
   idlflags    += -Wb,export_macro=TAO_SSLIOP_Export -Wb,export_include=orbsvcs/SSLIOP/SSLIOP_Export.h
   dynamicflags = TAO_SSLIOP_BUILD_DLL
diff --git a/TAO/orbsvcs/orbsvcs/Security.mpc b/TAO/orbsvcs/orbsvcs/Security.mpc
index 71b9446efb0..fb03dc6acc9 100644
--- a/TAO/orbsvcs/orbsvcs/Security.mpc
+++ b/TAO/orbsvcs/orbsvcs/Security.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(Security) : orbsvcslib, corba_messaging, core, portableserver, pi, interceptors, valuetype {
+project(Security) : orbsvcslib, corba_messaging, core, portableserver, pi, interceptors, valuetype, tao_versioning_idl_defaults {
   sharedname   = TAO_Security
   idlflags    += -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h
   dynamicflags = TAO_SECURITY_BUILD_DLL
diff --git a/TAO/orbsvcs/orbsvcs/Svc_Utils.mpc b/TAO/orbsvcs/orbsvcs/Svc_Utils.mpc
index 967b1e3eeb0..6d3f2ea5626 100644
--- a/TAO/orbsvcs/orbsvcs/Svc_Utils.mpc
+++ b/TAO/orbsvcs/orbsvcs/Svc_Utils.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(Svc_Utils) : orbsvcslib, core, portableserver {
+project(Svc_Utils) : orbsvcslib, core, portableserver, tao_versioning_idl_defaults {
   sharedname   = TAO_Svc_Utils
   idlflags    += -Wb,export_macro=TAO_Svc_Utils_Export -Wb,export_include=orbsvcs/svc_utils_export.h
   dynamicflags = TAO_SVC_UTILS_BUILD_DLL
diff --git a/TAO/tao/AnyTypeCode/AnySeq.pidl b/TAO/tao/AnyTypeCode/AnySeq.pidl
index fb3a570b657..f5e60ba8edd 100644
--- a/TAO/tao/AnyTypeCode/AnySeq.pidl
+++ b/TAO/tao/AnyTypeCode/AnySeq.pidl
@@ -13,6 +13,8 @@
  *          -Wb,export_include="tao/TAO_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
  *          AnySeq.pidl
  *
  */
diff --git a/TAO/tao/AnyTypeCode/Bounds.pidl b/TAO/tao/AnyTypeCode/Bounds.pidl
index c639e285fe5..707ab2b8158 100644
--- a/TAO/tao/AnyTypeCode/Bounds.pidl
+++ b/TAO/tao/AnyTypeCode/Bounds.pidl
@@ -15,6 +15,8 @@
  *        -Wb,export_include=TAO_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
  *        Bounds.pidl
  *
  * and then:
diff --git a/TAO/tao/AnyTypeCode/Dynamic.pidl b/TAO/tao/AnyTypeCode/Dynamic.pidl
index 9cc2be7c43d..50db7cdc1c0 100644
--- a/TAO/tao/AnyTypeCode/Dynamic.pidl
+++ b/TAO/tao/AnyTypeCode/Dynamic.pidl
@@ -15,6 +15,8 @@
  *          -Wb,export_include="tao/TAO_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
  *          Dynamic.pidl
  *
  */
diff --git a/TAO/tao/AnyTypeCode/Dynamic_Parameter.pidl b/TAO/tao/AnyTypeCode/Dynamic_Parameter.pidl
index f82dd8ba366..1f5c5dedd9d 100644
--- a/TAO/tao/AnyTypeCode/Dynamic_Parameter.pidl
+++ b/TAO/tao/AnyTypeCode/Dynamic_Parameter.pidl
@@ -15,6 +15,8 @@
  *          -Wb,export_include="tao/TAO_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
  *          Dynamic_Parameter.pidl
  *
  */
diff --git a/TAO/tao/AnyTypeCode/ValueModifier.pidl b/TAO/tao/AnyTypeCode/ValueModifier.pidl
index 4cd346c5049..2887587dddd 100644
--- a/TAO/tao/AnyTypeCode/ValueModifier.pidl
+++ b/TAO/tao/AnyTypeCode/ValueModifier.pidl
@@ -15,6 +15,8 @@
  *          -Wb,export_include="tao/TAO_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
  *          ValueModifier.pidl
  */
 // ================================================================
diff --git a/TAO/tao/AnyTypeCode/Visibility.pidl b/TAO/tao/AnyTypeCode/Visibility.pidl
index 44cece777a3..715b312bdf1 100644
--- a/TAO/tao/AnyTypeCode/Visibility.pidl
+++ b/TAO/tao/AnyTypeCode/Visibility.pidl
@@ -15,6 +15,8 @@
  *          -Wb,export_include="tao/TAO_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
  *          Visibilty.pidl
  */
 // ================================================================
diff --git a/TAO/tao/BiDir_GIOP/BiDirPolicy.pidl b/TAO/tao/BiDir_GIOP/BiDirPolicy.pidl
index 6659b56951d..3492fb54635 100644
--- a/TAO/tao/BiDir_GIOP/BiDirPolicy.pidl
+++ b/TAO/tao/BiDir_GIOP/BiDirPolicy.pidl
@@ -10,6 +10,8 @@
 //          -Wb,export_include="bidirgiop_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 \
 //          BiDirPolicy.pidl
 //
 //   This is from the GIOP 1.2 spec for Bi Dir IIOP.
diff --git a/TAO/tao/CONV_FRAME.pidl b/TAO/tao/CONV_FRAME.pidl
index 3f4684f6fb2..671887bff88 100644
--- a/TAO/tao/CONV_FRAME.pidl
+++ b/TAO/tao/CONV_FRAME.pidl
@@ -1,3 +1,5 @@
+// -*- IDL -*-
+
 /**
  * @file CONV_FRAME.pidl
  *
@@ -12,6 +14,8 @@
  *        -Wb,export_include="tao/TAO_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
  *        CONV_FRAME.pidl
  *
  * The files are ready to use.
diff --git a/TAO/tao/CSD_Framework/CSD_Framework.pidl b/TAO/tao/CSD_Framework/CSD_Framework.pidl
index c143b297d94..b0e78b39331 100644
--- a/TAO/tao/CSD_Framework/CSD_Framework.pidl
+++ b/TAO/tao/CSD_Framework/CSD_Framework.pidl
@@ -15,6 +15,8 @@
  *          -Wb,export_include="CSD_FW_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 \
  *          CSD_Framework.pidl
  *
  * After the file is generated a patch from the diffs directory must
diff --git a/TAO/tao/CharSeq.pidl b/TAO/tao/CharSeq.pidl
index e782b819123..a9a89c2735b 100644
--- a/TAO/tao/CharSeq.pidl
+++ b/TAO/tao/CharSeq.pidl
@@ -15,6 +15,8 @@
  *          -Wb,export_include=tao/TAO_Export.h
  *          -Wb,anyop_export_macro=TAO_AnyTypeCode_Export
  *          -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h
+ *          -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+ *          -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL
  *          CharSeq.pidl
  */
 
diff --git a/TAO/tao/CodecFactory/IOP_Codec.pidl b/TAO/tao/CodecFactory/IOP_Codec.pidl
index 4ed3333f5e5..79815dbb958 100644
--- a/TAO/tao/CodecFactory/IOP_Codec.pidl
+++ b/TAO/tao/CodecFactory/IOP_Codec.pidl
@@ -16,6 +16,8 @@
  *        -Wb,export_include=tao/TAO_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
  *        IOP_Codec.pidl
  *
  */
diff --git a/TAO/tao/CodecFactory/IOP_Codec_include.pidl b/TAO/tao/CodecFactory/IOP_Codec_include.pidl
index 734a0a7dac7..0d459f675dd 100644
--- a/TAO/tao/CodecFactory/IOP_Codec_include.pidl
+++ b/TAO/tao/CodecFactory/IOP_Codec_include.pidl
@@ -1,3 +1,5 @@
+// -*- IDL -*-
+
 /**
  * @file IOP_Codec_include.pidl
  *
@@ -20,6 +22,8 @@
  *          -Wb,export_include="tao/CodecFactory/codecfactory_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
  *          IOP_Codec_include.pidl
  *
  *   2. Then change this line in IOP_Codec_includeC.h:
diff --git a/TAO/tao/Current.pidl b/TAO/tao/Current.pidl
index b1d3067dad6..f90dcaddebf 100644
--- a/TAO/tao/Current.pidl
+++ b/TAO/tao/Current.pidl
@@ -1,3 +1,5 @@
+// -*- IDL -*-
+
 /**
  * @file Current.pidl
  *
@@ -12,6 +14,8 @@
  *         -Wb,export_include="tao/TAO_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
  *         Current.pidl
  *
  *
diff --git a/TAO/tao/Domain.pidl b/TAO/tao/Domain.pidl
index cb19c83a9aa..dd270caef6d 100644
--- a/TAO/tao/Domain.pidl
+++ b/TAO/tao/Domain.pidl
@@ -1,3 +1,5 @@
+// -*- IDL -*-
+
 /**
  * @file Domain.pidl
  *
@@ -19,6 +21,8 @@
  *          -Wb,export_include=TAO_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
  *          Domain.pidl
  *
  *   2. Then patch the generated code.  This patch (a) eliminates
diff --git a/TAO/tao/DoubleSeq.pidl b/TAO/tao/DoubleSeq.pidl
index 75b7c1dad53..f214a297fad 100644
--- a/TAO/tao/DoubleSeq.pidl
+++ b/TAO/tao/DoubleSeq.pidl
@@ -15,6 +15,8 @@
  *          -Wb,export_include=tao/TAO_Export.h
  *          -Wb,anyop_export_macro=TAO_AnyTypeCode_Export
  *          -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h
+ *          -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+ *          -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL
  *          DoubleSeq.pidl
  */
 
diff --git a/TAO/tao/DynamicAny/DynamicAny.pidl b/TAO/tao/DynamicAny/DynamicAny.pidl
index 1a6db982993..7006844c879 100644
--- a/TAO/tao/DynamicAny/DynamicAny.pidl
+++ b/TAO/tao/DynamicAny/DynamicAny.pidl
@@ -1,3 +1,5 @@
+// -*- IDL -*-
+
 /**
  * @file DynamicAny.pidl
  *
@@ -25,6 +27,8 @@
  *          -Wb,export_include=dynamicany_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 \
  *          DynamicAny.pidl
  *
  * after the file is generated a patch must be applied.  The patch
diff --git a/TAO/tao/FloatSeq.pidl b/TAO/tao/FloatSeq.pidl
index 1a0ee031940..07ef18b5e7f 100644
--- a/TAO/tao/FloatSeq.pidl
+++ b/TAO/tao/FloatSeq.pidl
@@ -15,6 +15,8 @@
  *          -Wb,export_include=tao/TAO_Export.h
  *          -Wb,anyop_export_macro=TAO_AnyTypeCode_Export
  *          -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h
+ *          -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+ *          -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL
  *          FloatSeq.pidl
  */
 
diff --git a/TAO/tao/GIOP.pidl b/TAO/tao/GIOP.pidl
index 6dc8616bdb6..da20ddb684b 100644
--- a/TAO/tao/GIOP.pidl
+++ b/TAO/tao/GIOP.pidl
@@ -19,6 +19,8 @@
 //          -Wb,export_include="tao/TAO_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
 //          GIOP.pidl
 //
 // ================================================================
diff --git a/TAO/tao/IFR_Client/IFR_Base.pidl b/TAO/tao/IFR_Client/IFR_Base.pidl
index 18cba35abea..331a0757b83 100644
--- a/TAO/tao/IFR_Client/IFR_Base.pidl
+++ b/TAO/tao/IFR_Client/IFR_Base.pidl
@@ -19,6 +19,8 @@
  *        -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
diff --git a/TAO/tao/IFR_Client/IFR_Basic.pidl b/TAO/tao/IFR_Client/IFR_Basic.pidl
index fa156e72b2d..01d2521ea48 100644
--- a/TAO/tao/IFR_Client/IFR_Basic.pidl
+++ b/TAO/tao/IFR_Client/IFR_Basic.pidl
@@ -18,6 +18,8 @@
  *          -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
diff --git a/TAO/tao/IFR_Client/IFR_Components.pidl b/TAO/tao/IFR_Client/IFR_Components.pidl
index 6bae6d0ebb0..7aa0102cd97 100644
--- a/TAO/tao/IFR_Client/IFR_Components.pidl
+++ b/TAO/tao/IFR_Client/IFR_Components.pidl
@@ -18,6 +18,8 @@
  *          -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_Extended.pidl b/TAO/tao/IFR_Client/IFR_Extended.pidl
index e0c06ce2c57..54675c6ef72 100644
--- a/TAO/tao/IFR_Client/IFR_Extended.pidl
+++ b/TAO/tao/IFR_Client/IFR_Extended.pidl
@@ -18,6 +18,8 @@
  *          -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/IIOP.pidl b/TAO/tao/IIOP.pidl
index cd52af48f60..3508d00b6cf 100644
--- a/TAO/tao/IIOP.pidl
+++ b/TAO/tao/IIOP.pidl
@@ -14,6 +14,8 @@
  *          -Wb,export_include="tao/TAO_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 \
  *          IIOP.pidl
  *
  *   Remember to patch the generated files using diff/IIOP.diff
diff --git a/TAO/tests/Param_Test/results.h b/TAO/tests/Param_Test/results.h
index e75bf267210..7c7857acd6c 100644
--- a/TAO/tests/Param_Test/results.h
+++ b/TAO/tests/Param_Test/results.h
@@ -28,10 +28,12 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 namespace CORBA
 {
   class Environment;
 }
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 class Results
 {