ChangeLogTag:Fri Jun 01 23:15:05 2001 Ossama Othman <ossama@uci.edu>

17 files changed, 2831 insertions, 2319 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index ebd6c72df0f..3a93e4d534a 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,41 @@
+Fri Jun 01 23:15:05 2001  Ossama Othman  <ossama@uci.edu>
+
+	* tao/IFR_Client/diffs/IFR_Base.pidl.diff:
+	* tao/IFR_Client/diffs/IFR_Basic.pidl.diff:
+	* tao/IFR_Client/diffs/IFR_Components.pidl.diff:
+	* tao/IFR_Client/diffs/IFR_Extended.pidl.diff:
+
+	  Regenerated these diffs so that they are actually correct.
+	  They were all reversed, and basically unusable.
+
+	* orbsvcs/IFR_Service/IFR_BaseS.cpp:
+	* orbsvcs/IFR_Service/IFR_BaseS.h:
+	* orbsvcs/IFR_Service/IFR_BaseS.i:
+	* orbsvcs/IFR_Service/IFR_BaseS_T.cpp:
+	* orbsvcs/IFR_Service/IFR_BaseS_T.h:
+	* orbsvcs/IFR_Service/IFR_BaseS_T.i:
+	* orbsvcs/IFR_Service/IFR_BasicS.cpp:
+	* orbsvcs/IFR_Service/IFR_BasicS.h:
+	* orbsvcs/IFR_Service/IFR_BasicS.i:
+	* orbsvcs/IFR_Service/IFR_BasicS_T.cpp:
+	* orbsvcs/IFR_Service/IFR_BasicS_T.h:
+	* orbsvcs/IFR_Service/IFR_BasicS_T.i:
+	* orbsvcs/IFR_Service/IFR_ComponentsS.cpp:
+	* orbsvcs/IFR_Service/IFR_ComponentsS.h:
+	* orbsvcs/IFR_Service/IFR_ComponentsS.i:
+	* orbsvcs/IFR_Service/IFR_ComponentsS_T.cpp:
+	* orbsvcs/IFR_Service/IFR_ComponentsS_T.h:
+	* orbsvcs/IFR_Service/IFR_ComponentsS_T.i:
+	* orbsvcs/IFR_Service/IFR_ExtendedS.cpp:
+	* orbsvcs/IFR_Service/IFR_ExtendedS.h:
+	* orbsvcs/IFR_Service/IFR_ExtendedS.i:
+	* orbsvcs/IFR_Service/IFR_ExtendedS_T.cpp:
+	* orbsvcs/IFR_Service/IFR_ExtendedS_T.h:
+	* orbsvcs/IFR_Service/IFR_ExtendedS_T.i:
+
+	  Regenerated these files to pull in an "unused argument" warning
+	  fix.
+
 Fri Jun 1 20:49:50 2001  Ossama Othman  <ossama@uci.edu>
 
 	* docs/ORBEndpoint.html:
diff --git a/TAO/orbsvcs/IFR_Service/IFR_BaseS.cpp b/TAO/orbsvcs/IFR_Service/IFR_BaseS.cpp
index 36252e3e31f..2193a95c80a 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_BaseS.cpp
+++ b/TAO/orbsvcs/IFR_Service/IFR_BaseS.cpp
@@ -55,9 +55,9 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 16:59:53 */
+/* starting time is 22:18:35 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /export/project/valinor/ossama/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_IRObject_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_IRObject_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_IRObject_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -151,7 +151,7 @@ TAO_CORBA_IRObject_Perfect_Hash_OpTable::lookup (const char *str, unsigned int l
     }
   return 0;
 }
-/* ending time is 16:59:53 */
+/* ending time is 22:18:35 */
 static TAO_CORBA_IRObject_Perfect_Hash_OpTable tao_CORBA_IRObject_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
@@ -601,12 +601,12 @@ void POA_CORBA_IRObject::_get_def_kind_skel (
   POA_CORBA_IRObject *_tao_impl =
     ACE_static_cast (POA_CORBA_IRObject *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA::DefinitionKind _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -668,6 +668,9 @@ void POA_CORBA_IRObject::_get_def_kind_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -682,12 +685,12 @@ void POA_CORBA_IRObject::destroy_skel (
   POA_CORBA_IRObject *_tao_impl =
     ACE_static_cast (POA_CORBA_IRObject *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
   _tao_server_request.argument_flag (0);
   
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -740,6 +743,9 @@ void POA_CORBA_IRObject::destroy_skel (
   
   _tao_server_request.init_reply ();
   
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -903,9 +909,9 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 16:59:53 */
+/* starting time is 22:18:36 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /export/project/valinor/ossama/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_Contained_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_Contained_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_Contained_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -1030,7 +1036,7 @@ TAO_CORBA_Contained_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
     }
   return 0;
 }
-/* ending time is 16:59:53 */
+/* ending time is 22:18:36 */
 static TAO_CORBA_Contained_Perfect_Hash_OpTable tao_CORBA_Contained_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
@@ -2924,12 +2930,12 @@ void POA_CORBA_Contained::_get_id_skel (
   POA_CORBA_Contained *_tao_impl =
     ACE_static_cast (POA_CORBA_Contained *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA::String_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -2992,6 +2998,9 @@ void POA_CORBA_Contained::_get_id_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -3007,9 +3016,6 @@ void POA_CORBA_Contained::_set_id_skel (
   POA_CORBA_Contained *_tao_impl =
     ACE_static_cast (POA_CORBA_Contained *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
   _tao_server_request.argument_flag (0);
     CORBA::String_var id;
   if (!(
@@ -3019,6 +3025,9 @@ void POA_CORBA_Contained::_set_id_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -3073,6 +3082,9 @@ void POA_CORBA_Contained::_set_id_skel (
   
   _tao_server_request.init_reply ();
   
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -3087,12 +3099,12 @@ void POA_CORBA_Contained::_get_name_skel (
   POA_CORBA_Contained *_tao_impl =
     ACE_static_cast (POA_CORBA_Contained *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA::String_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -3155,6 +3167,9 @@ void POA_CORBA_Contained::_get_name_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -3170,9 +3185,6 @@ void POA_CORBA_Contained::_set_name_skel (
   POA_CORBA_Contained *_tao_impl =
     ACE_static_cast (POA_CORBA_Contained *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
   _tao_server_request.argument_flag (0);
     CORBA::String_var name;
   if (!(
@@ -3182,6 +3194,9 @@ void POA_CORBA_Contained::_set_name_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -3236,6 +3251,9 @@ void POA_CORBA_Contained::_set_name_skel (
   
   _tao_server_request.init_reply ();
   
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -3250,12 +3268,12 @@ void POA_CORBA_Contained::_get_version_skel (
   POA_CORBA_Contained *_tao_impl =
     ACE_static_cast (POA_CORBA_Contained *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA::String_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -3318,6 +3336,9 @@ void POA_CORBA_Contained::_get_version_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -3333,9 +3354,6 @@ void POA_CORBA_Contained::_set_version_skel (
   POA_CORBA_Contained *_tao_impl =
     ACE_static_cast (POA_CORBA_Contained *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
   _tao_server_request.argument_flag (0);
     CORBA::String_var version;
   if (!(
@@ -3345,6 +3363,9 @@ void POA_CORBA_Contained::_set_version_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -3399,6 +3420,9 @@ void POA_CORBA_Contained::_set_version_skel (
   
   _tao_server_request.init_reply ();
   
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -3413,12 +3437,12 @@ void POA_CORBA_Contained::_get_defined_in_skel (
   POA_CORBA_Contained *_tao_impl =
     ACE_static_cast (POA_CORBA_Contained *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA_Container_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -3481,6 +3505,9 @@ void POA_CORBA_Contained::_get_defined_in_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -3495,12 +3522,12 @@ void POA_CORBA_Contained::_get_absolute_name_skel (
   POA_CORBA_Contained *_tao_impl =
     ACE_static_cast (POA_CORBA_Contained *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA::String_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -3563,6 +3590,9 @@ void POA_CORBA_Contained::_get_absolute_name_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -3577,12 +3607,12 @@ void POA_CORBA_Contained::_get_containing_repository_skel (
   POA_CORBA_Contained *_tao_impl =
     ACE_static_cast (POA_CORBA_Contained *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA_Repository_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -3645,6 +3675,9 @@ void POA_CORBA_Contained::_get_containing_repository_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -3659,12 +3692,12 @@ void POA_CORBA_Contained::describe_skel (
   POA_CORBA_Contained *_tao_impl =
     ACE_static_cast (POA_CORBA_Contained *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA_Contained::Description_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -3727,6 +3760,9 @@ void POA_CORBA_Contained::describe_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -3742,9 +3778,6 @@ void POA_CORBA_Contained::move_skel (
   POA_CORBA_Contained *_tao_impl =
     ACE_static_cast (POA_CORBA_Contained *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
   _tao_server_request.argument_flag (0);
     CORBA_Container_var new_container;
   CORBA::String_var new_name;
@@ -3758,6 +3791,9 @@ void POA_CORBA_Contained::move_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -3816,6 +3852,9 @@ void POA_CORBA_Contained::move_skel (
   
   _tao_server_request.init_reply ();
   
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -3982,9 +4021,9 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 16:59:53 */
+/* starting time is 22:18:38 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /export/project/valinor/ossama/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_Container_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_Container_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_Container_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -4115,7 +4154,7 @@ TAO_CORBA_Container_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
     }
   return 0;
 }
-/* ending time is 16:59:53 */
+/* ending time is 22:18:38 */
 static TAO_CORBA_Container_Perfect_Hash_OpTable tao_CORBA_Container_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
@@ -7634,9 +7673,6 @@ void POA_CORBA_Container::lookup_skel (
   POA_CORBA_Container *_tao_impl =
     ACE_static_cast (POA_CORBA_Container *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA_Contained_var _tao_retval;
   CORBA::String_var search_name;
   if (!(
@@ -7646,6 +7682,9 @@ void POA_CORBA_Container::lookup_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -7710,6 +7749,9 @@ void POA_CORBA_Container::lookup_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -7725,9 +7767,6 @@ void POA_CORBA_Container::contents_skel (
   POA_CORBA_Container *_tao_impl =
     ACE_static_cast (POA_CORBA_Container *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA_ContainedSeq_var _tao_retval;
   CORBA::DefinitionKind limit_type;
   CORBA::Boolean exclude_inherited;
@@ -7739,6 +7778,9 @@ void POA_CORBA_Container::contents_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -7805,6 +7847,9 @@ void POA_CORBA_Container::contents_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -7820,9 +7865,6 @@ void POA_CORBA_Container::lookup_name_skel (
   POA_CORBA_Container *_tao_impl =
     ACE_static_cast (POA_CORBA_Container *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA_ContainedSeq_var _tao_retval;
   CORBA::String_var search_name;
   CORBA::Long levels_to_search;
@@ -7838,6 +7880,9 @@ void POA_CORBA_Container::lookup_name_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -7908,6 +7953,9 @@ void POA_CORBA_Container::lookup_name_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -7923,9 +7971,6 @@ void POA_CORBA_Container::describe_contents_skel (
   POA_CORBA_Container *_tao_impl =
     ACE_static_cast (POA_CORBA_Container *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA_Container::DescriptionSeq_var _tao_retval;
   CORBA::DefinitionKind limit_type;
   CORBA::Boolean exclude_inherited;
@@ -7939,6 +7984,9 @@ void POA_CORBA_Container::describe_contents_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -8007,6 +8055,9 @@ void POA_CORBA_Container::describe_contents_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -8022,9 +8073,6 @@ void POA_CORBA_Container::create_module_skel (
   POA_CORBA_Container *_tao_impl =
     ACE_static_cast (POA_CORBA_Container *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA_ModuleDef_var _tao_retval;
   CORBA::String_var id;
   CORBA::String_var name;
@@ -8038,6 +8086,9 @@ void POA_CORBA_Container::create_module_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -8106,6 +8157,9 @@ void POA_CORBA_Container::create_module_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -8121,9 +8175,6 @@ void POA_CORBA_Container::create_constant_skel (
   POA_CORBA_Container *_tao_impl =
     ACE_static_cast (POA_CORBA_Container *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA_ConstantDef_var _tao_retval;
   CORBA::String_var id;
   CORBA::String_var name;
@@ -8141,6 +8192,9 @@ void POA_CORBA_Container::create_constant_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -8213,6 +8267,9 @@ void POA_CORBA_Container::create_constant_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -8228,9 +8285,6 @@ void POA_CORBA_Container::create_struct_skel (
   POA_CORBA_Container *_tao_impl =
     ACE_static_cast (POA_CORBA_Container *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA_StructDef_var _tao_retval;
   CORBA::String_var id;
   CORBA::String_var name;
@@ -8246,6 +8300,9 @@ void POA_CORBA_Container::create_struct_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -8316,6 +8373,9 @@ void POA_CORBA_Container::create_struct_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -8331,9 +8391,6 @@ void POA_CORBA_Container::create_union_skel (
   POA_CORBA_Container *_tao_impl =
     ACE_static_cast (POA_CORBA_Container *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA_UnionDef_var _tao_retval;
   CORBA::String_var id;
   CORBA::String_var name;
@@ -8351,6 +8408,9 @@ void POA_CORBA_Container::create_union_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -8423,6 +8483,9 @@ void POA_CORBA_Container::create_union_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -8438,9 +8501,6 @@ void POA_CORBA_Container::create_enum_skel (
   POA_CORBA_Container *_tao_impl =
     ACE_static_cast (POA_CORBA_Container *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA_EnumDef_var _tao_retval;
   CORBA::String_var id;
   CORBA::String_var name;
@@ -8456,6 +8516,9 @@ void POA_CORBA_Container::create_enum_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -8526,6 +8589,9 @@ void POA_CORBA_Container::create_enum_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -8541,9 +8607,6 @@ void POA_CORBA_Container::create_alias_skel (
   POA_CORBA_Container *_tao_impl =
     ACE_static_cast (POA_CORBA_Container *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA_AliasDef_var _tao_retval;
   CORBA::String_var id;
   CORBA::String_var name;
@@ -8559,6 +8622,9 @@ void POA_CORBA_Container::create_alias_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -8629,6 +8695,9 @@ void POA_CORBA_Container::create_alias_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -8644,9 +8713,6 @@ void POA_CORBA_Container::create_interface_skel (
   POA_CORBA_Container *_tao_impl =
     ACE_static_cast (POA_CORBA_Container *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA_InterfaceDef_var _tao_retval;
   CORBA::String_var id;
   CORBA::String_var name;
@@ -8662,6 +8728,9 @@ void POA_CORBA_Container::create_interface_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -8732,6 +8801,9 @@ void POA_CORBA_Container::create_interface_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -8747,9 +8819,6 @@ void POA_CORBA_Container::create_value_skel (
   POA_CORBA_Container *_tao_impl =
     ACE_static_cast (POA_CORBA_Container *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA_ValueDef_var _tao_retval;
   CORBA::String_var id;
   CORBA::String_var name;
@@ -8777,6 +8846,9 @@ void POA_CORBA_Container::create_value_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -8859,6 +8931,9 @@ void POA_CORBA_Container::create_value_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -8874,9 +8949,6 @@ void POA_CORBA_Container::create_value_box_skel (
   POA_CORBA_Container *_tao_impl =
     ACE_static_cast (POA_CORBA_Container *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA_ValueBoxDef_var _tao_retval;
   CORBA::String_var id;
   CORBA::String_var name;
@@ -8892,6 +8964,9 @@ void POA_CORBA_Container::create_value_box_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -8962,6 +9037,9 @@ void POA_CORBA_Container::create_value_box_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -8977,9 +9055,6 @@ void POA_CORBA_Container::create_exception_skel (
   POA_CORBA_Container *_tao_impl =
     ACE_static_cast (POA_CORBA_Container *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA_ExceptionDef_var _tao_retval;
   CORBA::String_var id;
   CORBA::String_var name;
@@ -8995,6 +9070,9 @@ void POA_CORBA_Container::create_exception_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -9065,6 +9143,9 @@ void POA_CORBA_Container::create_exception_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -9080,9 +9161,6 @@ void POA_CORBA_Container::create_native_skel (
   POA_CORBA_Container *_tao_impl =
     ACE_static_cast (POA_CORBA_Container *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA_NativeDef_var _tao_retval;
   CORBA::String_var id;
   CORBA::String_var name;
@@ -9096,6 +9174,9 @@ void POA_CORBA_Container::create_native_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -9164,6 +9245,9 @@ void POA_CORBA_Container::create_native_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -9179,9 +9263,6 @@ void POA_CORBA_Container::create_abstract_interface_skel (
   POA_CORBA_Container *_tao_impl =
     ACE_static_cast (POA_CORBA_Container *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA_AbstractInterfaceDef_var _tao_retval;
   CORBA::String_var id;
   CORBA::String_var name;
@@ -9197,6 +9278,9 @@ void POA_CORBA_Container::create_abstract_interface_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -9267,6 +9351,9 @@ void POA_CORBA_Container::create_abstract_interface_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -9282,9 +9369,6 @@ void POA_CORBA_Container::create_local_interface_skel (
   POA_CORBA_Container *_tao_impl =
     ACE_static_cast (POA_CORBA_Container *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA_LocalInterfaceDef_var _tao_retval;
   CORBA::String_var id;
   CORBA::String_var name;
@@ -9300,6 +9384,9 @@ void POA_CORBA_Container::create_local_interface_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -9370,6 +9457,9 @@ void POA_CORBA_Container::create_local_interface_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -9536,9 +9626,9 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 16:59:53 */
+/* starting time is 22:18:41 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /export/project/valinor/ossama/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_IDLType_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_IDLType_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_IDLType_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -9633,7 +9723,7 @@ TAO_CORBA_IDLType_Perfect_Hash_OpTable::lookup (const char *str, unsigned int le
     }
   return 0;
 }
-/* ending time is 16:59:53 */
+/* ending time is 22:18:41 */
 static TAO_CORBA_IDLType_Perfect_Hash_OpTable tao_CORBA_IDLType_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
@@ -9941,12 +10031,12 @@ void POA_CORBA_IDLType::_get_type_skel (
   POA_CORBA_IDLType *_tao_impl =
     ACE_static_cast (POA_CORBA_IDLType *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA::TypeCode_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -10009,6 +10099,9 @@ void POA_CORBA_IDLType::_get_type_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -10175,9 +10268,9 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 16:59:53 */
+/* starting time is 22:18:42 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /export/project/valinor/ossama/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_TypedefDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_TypedefDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_TypedefDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -10303,7 +10396,7 @@ TAO_CORBA_TypedefDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
     }
   return 0;
 }
-/* ending time is 16:59:53 */
+/* ending time is 22:18:42 */
 static TAO_CORBA_TypedefDef_Perfect_Hash_OpTable tao_CORBA_TypedefDef_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
diff --git a/TAO/orbsvcs/IFR_Service/IFR_BaseS.h b/TAO/orbsvcs/IFR_Service/IFR_BaseS.h
index 57d4ca05c58..c06ea700b74 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_BaseS.h
+++ b/TAO/orbsvcs/IFR_Service/IFR_BaseS.h
@@ -52,7 +52,7 @@ typedef POA_CORBA_IRObject *POA_CORBA_IRObject_ptr;
 class _TAO_CORBA_IRObject_ThruPOA_Proxy_Impl;
 class _TAO_CORBA_IRObject_Strategized_Proxy_Broker;
 
-class POA_CORBA_IRObject :  public virtual PortableServer::ServantBase
+class  POA_CORBA_IRObject :  public virtual PortableServer::ServantBase
 {
 protected:
   POA_CORBA_IRObject (void);
@@ -144,7 +144,7 @@ public:
 //               Strategized Proxy Broker Declaration 
 //
 
-class _TAO_CORBA_IRObject_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_IRObject_Proxy_Broker
+class  _TAO_CORBA_IRObject_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_IRObject_Proxy_Broker
 {
 public: 
   _TAO_CORBA_IRObject_Strategized_Proxy_Broker (void);
@@ -192,7 +192,7 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class _TAO_CORBA_IRObject_ThruPOA_Proxy_Impl : 
+class  _TAO_CORBA_IRObject_ThruPOA_Proxy_Impl : 
   public virtual ::_TAO_CORBA_IRObject_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl
 {
@@ -231,7 +231,7 @@ typedef POA_CORBA_Contained *POA_CORBA_Contained_ptr;
 class _TAO_CORBA_Contained_ThruPOA_Proxy_Impl;
 class _TAO_CORBA_Contained_Strategized_Proxy_Broker;
 
-class POA_CORBA_Contained : public virtual POA_CORBA_IRObject
+class  POA_CORBA_Contained : public virtual POA_CORBA_IRObject
 {
 protected:
   POA_CORBA_Contained (void);
@@ -480,7 +480,7 @@ public:
 //               Strategized Proxy Broker Declaration 
 //
 
-class _TAO_CORBA_Contained_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_Contained_Proxy_Broker
+class  _TAO_CORBA_Contained_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_Contained_Proxy_Broker
 {
 public: 
   _TAO_CORBA_Contained_Strategized_Proxy_Broker (void);
@@ -528,7 +528,7 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class _TAO_CORBA_Contained_ThruPOA_Proxy_Impl : 
+class  _TAO_CORBA_Contained_ThruPOA_Proxy_Impl : 
   public virtual ::_TAO_CORBA_Contained_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
   public virtual ::_TAO_CORBA_IRObject_ThruPOA_Proxy_Impl
@@ -647,7 +647,7 @@ typedef POA_CORBA_Container *POA_CORBA_Container_ptr;
 class _TAO_CORBA_Container_ThruPOA_Proxy_Impl;
 class _TAO_CORBA_Container_Strategized_Proxy_Broker;
 
-class POA_CORBA_Container : public virtual POA_CORBA_IRObject
+class  POA_CORBA_Container : public virtual POA_CORBA_IRObject
 {
 protected:
   POA_CORBA_Container (void);
@@ -1048,7 +1048,7 @@ public:
 //               Strategized Proxy Broker Declaration 
 //
 
-class _TAO_CORBA_Container_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_Container_Proxy_Broker
+class  _TAO_CORBA_Container_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_Container_Proxy_Broker
 {
 public: 
   _TAO_CORBA_Container_Strategized_Proxy_Broker (void);
@@ -1096,7 +1096,7 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class _TAO_CORBA_Container_ThruPOA_Proxy_Impl : 
+class  _TAO_CORBA_Container_ThruPOA_Proxy_Impl : 
   public virtual ::_TAO_CORBA_Container_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
   public virtual ::_TAO_CORBA_IRObject_ThruPOA_Proxy_Impl
@@ -1325,7 +1325,7 @@ typedef POA_CORBA_IDLType *POA_CORBA_IDLType_ptr;
 class _TAO_CORBA_IDLType_ThruPOA_Proxy_Impl;
 class _TAO_CORBA_IDLType_Strategized_Proxy_Broker;
 
-class POA_CORBA_IDLType : public virtual POA_CORBA_IRObject
+class  POA_CORBA_IDLType : public virtual POA_CORBA_IRObject
 {
 protected:
   POA_CORBA_IDLType (void);
@@ -1418,7 +1418,7 @@ public:
 //               Strategized Proxy Broker Declaration 
 //
 
-class _TAO_CORBA_IDLType_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_IDLType_Proxy_Broker
+class  _TAO_CORBA_IDLType_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_IDLType_Proxy_Broker
 {
 public: 
   _TAO_CORBA_IDLType_Strategized_Proxy_Broker (void);
@@ -1466,7 +1466,7 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class _TAO_CORBA_IDLType_ThruPOA_Proxy_Impl : 
+class  _TAO_CORBA_IDLType_ThruPOA_Proxy_Impl : 
   public virtual ::_TAO_CORBA_IDLType_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
   public virtual ::_TAO_CORBA_IRObject_ThruPOA_Proxy_Impl
@@ -1499,7 +1499,7 @@ typedef POA_CORBA_TypedefDef *POA_CORBA_TypedefDef_ptr;
 class _TAO_CORBA_TypedefDef_ThruPOA_Proxy_Impl;
 class _TAO_CORBA_TypedefDef_Strategized_Proxy_Broker;
 
-class POA_CORBA_TypedefDef : public virtual POA_CORBA_Contained, public virtual POA_CORBA_IDLType
+class  POA_CORBA_TypedefDef : public virtual POA_CORBA_Contained, public virtual POA_CORBA_IDLType
 {
 protected:
   POA_CORBA_TypedefDef (void);
@@ -1673,7 +1673,7 @@ public:
 //               Strategized Proxy Broker Declaration 
 //
 
-class _TAO_CORBA_TypedefDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_TypedefDef_Proxy_Broker
+class  _TAO_CORBA_TypedefDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_TypedefDef_Proxy_Broker
 {
 public: 
   _TAO_CORBA_TypedefDef_Strategized_Proxy_Broker (void);
@@ -1721,7 +1721,7 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class _TAO_CORBA_TypedefDef_ThruPOA_Proxy_Impl : 
+class  _TAO_CORBA_TypedefDef_ThruPOA_Proxy_Impl : 
   public virtual ::_TAO_CORBA_TypedefDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
   public virtual ::_TAO_CORBA_Contained_ThruPOA_Proxy_Impl, 
diff --git a/TAO/orbsvcs/IFR_Service/IFR_BaseS_T.h b/TAO/orbsvcs/IFR_Service/IFR_BaseS_T.h
index 14b96e3facc..fb327f82865 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_BaseS_T.h
+++ b/TAO/orbsvcs/IFR_Service/IFR_BaseS_T.h
@@ -39,7 +39,7 @@ TAO_NAMESPACE_CLOSE // module CORBA
 
 // TIE class: Refer to CORBA v2.2, Section 20.34.4
 template <class T>
-class POA_CORBA_IRObject_tie : public POA_CORBA_IRObject
+class  POA_CORBA_IRObject_tie : public POA_CORBA_IRObject
 {
 public:
   POA_CORBA_IRObject_tie (T &t);
@@ -98,7 +98,7 @@ public:
 
 // TIE class: Refer to CORBA v2.2, Section 20.34.4
 template <class T>
-class POA_CORBA_Contained_tie : public POA_CORBA_Contained
+class  POA_CORBA_Contained_tie : public POA_CORBA_Contained
 {
 public:
   POA_CORBA_Contained_tie (T &t);
@@ -251,7 +251,7 @@ public:
 
 // TIE class: Refer to CORBA v2.2, Section 20.34.4
 template <class T>
-class POA_CORBA_Container_tie : public POA_CORBA_Container
+class  POA_CORBA_Container_tie : public POA_CORBA_Container
 {
 public:
   POA_CORBA_Container_tie (T &t);
@@ -514,7 +514,7 @@ public:
 
 // TIE class: Refer to CORBA v2.2, Section 20.34.4
 template <class T>
-class POA_CORBA_IDLType_tie : public POA_CORBA_IDLType
+class  POA_CORBA_IDLType_tie : public POA_CORBA_IDLType
 {
 public:
   POA_CORBA_IDLType_tie (T &t);
@@ -581,7 +581,7 @@ public:
 
 // TIE class: Refer to CORBA v2.2, Section 20.34.4
 template <class T>
-class POA_CORBA_TypedefDef_tie : public POA_CORBA_TypedefDef
+class  POA_CORBA_TypedefDef_tie : public POA_CORBA_TypedefDef
 {
 public:
   POA_CORBA_TypedefDef_tie (T &t);
diff --git a/TAO/orbsvcs/IFR_Service/IFR_BasicS.cpp b/TAO/orbsvcs/IFR_Service/IFR_BasicS.cpp
index 54964d7e296..f18d0a4a38d 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_BasicS.cpp
+++ b/TAO/orbsvcs/IFR_Service/IFR_BasicS.cpp
@@ -54,9 +54,9 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 20:17:33 */
+/* starting time is 22:45:25 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /export/project/valinor/ossama/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_Repository_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_Repository_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_Repository_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -197,7 +197,7 @@ TAO_CORBA_Repository_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
     }
   return 0;
 }
-/* ending time is 20:17:33 */
+/* ending time is 22:45:25 */
 static TAO_CORBA_Repository_Perfect_Hash_OpTable tao_CORBA_Repository_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
@@ -1746,9 +1746,6 @@ void POA_CORBA_Repository::lookup_id_skel (
   POA_CORBA_Repository *_tao_impl =
     ACE_static_cast (POA_CORBA_Repository *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA_Contained_var _tao_retval;
   CORBA::String_var search_id;
   if (!(
@@ -1758,6 +1755,9 @@ void POA_CORBA_Repository::lookup_id_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -1822,6 +1822,9 @@ void POA_CORBA_Repository::lookup_id_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -1837,9 +1840,6 @@ void POA_CORBA_Repository::get_canonical_typecode_skel (
   POA_CORBA_Repository *_tao_impl =
     ACE_static_cast (POA_CORBA_Repository *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA::TypeCode_var _tao_retval;
   CORBA::TypeCode_var tc;
   if (!(
@@ -1849,6 +1849,9 @@ void POA_CORBA_Repository::get_canonical_typecode_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -1913,6 +1916,9 @@ void POA_CORBA_Repository::get_canonical_typecode_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -1928,9 +1934,6 @@ void POA_CORBA_Repository::get_primitive_skel (
   POA_CORBA_Repository *_tao_impl =
     ACE_static_cast (POA_CORBA_Repository *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA_PrimitiveDef_var _tao_retval;
   CORBA::PrimitiveKind kind;
   if (!(
@@ -1940,6 +1943,9 @@ void POA_CORBA_Repository::get_primitive_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -2004,6 +2010,9 @@ void POA_CORBA_Repository::get_primitive_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -2019,9 +2028,6 @@ void POA_CORBA_Repository::create_string_skel (
   POA_CORBA_Repository *_tao_impl =
     ACE_static_cast (POA_CORBA_Repository *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA_StringDef_var _tao_retval;
   CORBA::ULong bound;
   if (!(
@@ -2031,6 +2037,9 @@ void POA_CORBA_Repository::create_string_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -2095,6 +2104,9 @@ void POA_CORBA_Repository::create_string_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -2110,9 +2122,6 @@ void POA_CORBA_Repository::create_wstring_skel (
   POA_CORBA_Repository *_tao_impl =
     ACE_static_cast (POA_CORBA_Repository *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA_WstringDef_var _tao_retval;
   CORBA::ULong bound;
   if (!(
@@ -2122,6 +2131,9 @@ void POA_CORBA_Repository::create_wstring_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -2186,6 +2198,9 @@ void POA_CORBA_Repository::create_wstring_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -2201,9 +2216,6 @@ void POA_CORBA_Repository::create_sequence_skel (
   POA_CORBA_Repository *_tao_impl =
     ACE_static_cast (POA_CORBA_Repository *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA_SequenceDef_var _tao_retval;
   CORBA::ULong bound;
   CORBA_IDLType_var element_type;
@@ -2215,6 +2227,9 @@ void POA_CORBA_Repository::create_sequence_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -2281,6 +2296,9 @@ void POA_CORBA_Repository::create_sequence_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -2296,9 +2314,6 @@ void POA_CORBA_Repository::create_array_skel (
   POA_CORBA_Repository *_tao_impl =
     ACE_static_cast (POA_CORBA_Repository *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA_ArrayDef_var _tao_retval;
   CORBA::ULong length;
   CORBA_IDLType_var element_type;
@@ -2310,6 +2325,9 @@ void POA_CORBA_Repository::create_array_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -2376,6 +2394,9 @@ void POA_CORBA_Repository::create_array_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -2391,9 +2412,6 @@ void POA_CORBA_Repository::create_fixed_skel (
   POA_CORBA_Repository *_tao_impl =
     ACE_static_cast (POA_CORBA_Repository *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA_FixedDef_var _tao_retval;
   CORBA::UShort digits;
   CORBA::Short scale;
@@ -2405,6 +2423,9 @@ void POA_CORBA_Repository::create_fixed_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -2471,6 +2492,9 @@ void POA_CORBA_Repository::create_fixed_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -2640,9 +2664,9 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 20:17:33 */
+/* starting time is 22:45:26 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /export/project/valinor/ossama/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ModuleDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ModuleDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ModuleDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -2786,7 +2810,7 @@ TAO_CORBA_ModuleDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
     }
   return 0;
 }
-/* ending time is 20:17:33 */
+/* ending time is 22:45:26 */
 static TAO_CORBA_ModuleDef_Perfect_Hash_OpTable tao_CORBA_ModuleDef_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
@@ -3098,9 +3122,9 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 20:17:33 */
+/* starting time is 22:45:27 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /export/project/valinor/ossama/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ConstantDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ConstantDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ConstantDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -3230,7 +3254,7 @@ TAO_CORBA_ConstantDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned in
     }
   return 0;
 }
-/* ending time is 20:17:33 */
+/* ending time is 22:45:27 */
 static TAO_CORBA_ConstantDef_Perfect_Hash_OpTable tao_CORBA_ConstantDef_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
@@ -4167,12 +4191,12 @@ void POA_CORBA_ConstantDef::_get_type_skel (
   POA_CORBA_ConstantDef *_tao_impl =
     ACE_static_cast (POA_CORBA_ConstantDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA::TypeCode_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -4235,6 +4259,9 @@ void POA_CORBA_ConstantDef::_get_type_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -4249,12 +4276,12 @@ void POA_CORBA_ConstantDef::_get_type_def_skel (
   POA_CORBA_ConstantDef *_tao_impl =
     ACE_static_cast (POA_CORBA_ConstantDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA_IDLType_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -4317,6 +4344,9 @@ void POA_CORBA_ConstantDef::_get_type_def_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -4332,9 +4362,6 @@ void POA_CORBA_ConstantDef::_set_type_def_skel (
   POA_CORBA_ConstantDef *_tao_impl =
     ACE_static_cast (POA_CORBA_ConstantDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
   _tao_server_request.argument_flag (0);
     CORBA_IDLType_var type_def;
   if (!(
@@ -4344,6 +4371,9 @@ void POA_CORBA_ConstantDef::_set_type_def_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -4398,6 +4428,9 @@ void POA_CORBA_ConstantDef::_set_type_def_skel (
   
   _tao_server_request.init_reply ();
   
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -4412,12 +4445,12 @@ void POA_CORBA_ConstantDef::_get_value_skel (
   POA_CORBA_ConstantDef *_tao_impl =
     ACE_static_cast (POA_CORBA_ConstantDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA::Any_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -4480,6 +4513,9 @@ void POA_CORBA_ConstantDef::_get_value_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -4495,9 +4531,6 @@ void POA_CORBA_ConstantDef::_set_value_skel (
   POA_CORBA_ConstantDef *_tao_impl =
     ACE_static_cast (POA_CORBA_ConstantDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
   _tao_server_request.argument_flag (0);
     CORBA::Any value;
   if (!(
@@ -4507,6 +4540,9 @@ void POA_CORBA_ConstantDef::_set_value_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -4561,6 +4597,9 @@ void POA_CORBA_ConstantDef::_set_value_skel (
   
   _tao_server_request.init_reply ();
   
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -4730,9 +4769,9 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 20:17:33 */
+/* starting time is 22:45:28 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /export/project/valinor/ossama/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_StructDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_StructDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_StructDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -4879,7 +4918,7 @@ TAO_CORBA_StructDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
     }
   return 0;
 }
-/* ending time is 20:17:33 */
+/* ending time is 22:45:28 */
 static TAO_CORBA_StructDef_Perfect_Hash_OpTable tao_CORBA_StructDef_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
@@ -5349,12 +5388,12 @@ void POA_CORBA_StructDef::_get_members_skel (
   POA_CORBA_StructDef *_tao_impl =
     ACE_static_cast (POA_CORBA_StructDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA_StructMemberSeq_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -5417,6 +5456,9 @@ void POA_CORBA_StructDef::_get_members_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -5432,9 +5474,6 @@ void POA_CORBA_StructDef::_set_members_skel (
   POA_CORBA_StructDef *_tao_impl =
     ACE_static_cast (POA_CORBA_StructDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
   _tao_server_request.argument_flag (0);
     CORBA_StructMemberSeq members;
   if (!(
@@ -5444,6 +5483,9 @@ void POA_CORBA_StructDef::_set_members_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -5498,6 +5540,9 @@ void POA_CORBA_StructDef::_set_members_skel (
   
   _tao_server_request.init_reply ();
   
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -5676,9 +5721,9 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 20:17:33 */
+/* starting time is 22:45:29 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /export/project/valinor/ossama/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_UnionDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_UnionDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_UnionDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -5828,7 +5873,7 @@ TAO_CORBA_UnionDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int l
     }
   return 0;
 }
-/* ending time is 20:17:33 */
+/* ending time is 22:45:29 */
 static TAO_CORBA_UnionDef_Perfect_Hash_OpTable tao_CORBA_UnionDef_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
@@ -6768,12 +6813,12 @@ void POA_CORBA_UnionDef::_get_discriminator_type_skel (
   POA_CORBA_UnionDef *_tao_impl =
     ACE_static_cast (POA_CORBA_UnionDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA::TypeCode_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -6836,6 +6881,9 @@ void POA_CORBA_UnionDef::_get_discriminator_type_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -6850,12 +6898,12 @@ void POA_CORBA_UnionDef::_get_discriminator_type_def_skel (
   POA_CORBA_UnionDef *_tao_impl =
     ACE_static_cast (POA_CORBA_UnionDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA_IDLType_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -6918,6 +6966,9 @@ void POA_CORBA_UnionDef::_get_discriminator_type_def_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -6933,9 +6984,6 @@ void POA_CORBA_UnionDef::_set_discriminator_type_def_skel (
   POA_CORBA_UnionDef *_tao_impl =
     ACE_static_cast (POA_CORBA_UnionDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
   _tao_server_request.argument_flag (0);
     CORBA_IDLType_var discriminator_type_def;
   if (!(
@@ -6945,6 +6993,9 @@ void POA_CORBA_UnionDef::_set_discriminator_type_def_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -6999,6 +7050,9 @@ void POA_CORBA_UnionDef::_set_discriminator_type_def_skel (
   
   _tao_server_request.init_reply ();
   
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -7013,12 +7067,12 @@ void POA_CORBA_UnionDef::_get_members_skel (
   POA_CORBA_UnionDef *_tao_impl =
     ACE_static_cast (POA_CORBA_UnionDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA_UnionMemberSeq_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -7081,6 +7135,9 @@ void POA_CORBA_UnionDef::_get_members_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -7096,9 +7153,6 @@ void POA_CORBA_UnionDef::_set_members_skel (
   POA_CORBA_UnionDef *_tao_impl =
     ACE_static_cast (POA_CORBA_UnionDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
   _tao_server_request.argument_flag (0);
     CORBA_UnionMemberSeq members;
   if (!(
@@ -7108,6 +7162,9 @@ void POA_CORBA_UnionDef::_set_members_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -7162,6 +7219,9 @@ void POA_CORBA_UnionDef::_set_members_skel (
   
   _tao_server_request.init_reply ();
   
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -7340,9 +7400,9 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 20:17:33 */
+/* starting time is 22:45:30 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /export/project/valinor/ossama/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_EnumDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_EnumDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_EnumDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -7470,7 +7530,7 @@ TAO_CORBA_EnumDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int le
     }
   return 0;
 }
-/* ending time is 20:17:33 */
+/* ending time is 22:45:30 */
 static TAO_CORBA_EnumDef_Perfect_Hash_OpTable tao_CORBA_EnumDef_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
@@ -7939,12 +7999,12 @@ void POA_CORBA_EnumDef::_get_members_skel (
   POA_CORBA_EnumDef *_tao_impl =
     ACE_static_cast (POA_CORBA_EnumDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA_EnumMemberSeq_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -8007,6 +8067,9 @@ void POA_CORBA_EnumDef::_get_members_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -8022,9 +8085,6 @@ void POA_CORBA_EnumDef::_set_members_skel (
   POA_CORBA_EnumDef *_tao_impl =
     ACE_static_cast (POA_CORBA_EnumDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
   _tao_server_request.argument_flag (0);
     CORBA_EnumMemberSeq members;
   if (!(
@@ -8034,6 +8094,9 @@ void POA_CORBA_EnumDef::_set_members_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -8088,6 +8151,9 @@ void POA_CORBA_EnumDef::_set_members_skel (
   
   _tao_server_request.init_reply ();
   
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -8263,9 +8329,9 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 20:17:33 */
+/* starting time is 22:45:30 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /export/project/valinor/ossama/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_AliasDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_AliasDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_AliasDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -8393,7 +8459,7 @@ TAO_CORBA_AliasDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int l
     }
   return 0;
 }
-/* ending time is 20:17:33 */
+/* ending time is 22:45:30 */
 static TAO_CORBA_AliasDef_Perfect_Hash_OpTable tao_CORBA_AliasDef_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
@@ -8862,12 +8928,12 @@ void POA_CORBA_AliasDef::_get_original_type_def_skel (
   POA_CORBA_AliasDef *_tao_impl =
     ACE_static_cast (POA_CORBA_AliasDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA_IDLType_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -8930,6 +8996,9 @@ void POA_CORBA_AliasDef::_get_original_type_def_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -8945,9 +9014,6 @@ void POA_CORBA_AliasDef::_set_original_type_def_skel (
   POA_CORBA_AliasDef *_tao_impl =
     ACE_static_cast (POA_CORBA_AliasDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
   _tao_server_request.argument_flag (0);
     CORBA_IDLType_var original_type_def;
   if (!(
@@ -8957,6 +9023,9 @@ void POA_CORBA_AliasDef::_set_original_type_def_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -9011,6 +9080,9 @@ void POA_CORBA_AliasDef::_set_original_type_def_skel (
   
   _tao_server_request.init_reply ();
   
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -9186,9 +9258,9 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 20:17:33 */
+/* starting time is 22:45:31 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /export/project/valinor/ossama/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_NativeDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_NativeDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_NativeDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -9314,7 +9386,7 @@ TAO_CORBA_NativeDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
     }
   return 0;
 }
-/* ending time is 20:17:33 */
+/* ending time is 22:45:31 */
 static TAO_CORBA_NativeDef_Perfect_Hash_OpTable tao_CORBA_NativeDef_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
@@ -9630,9 +9702,9 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 20:17:33 */
+/* starting time is 22:45:31 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /export/project/valinor/ossama/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_PrimitiveDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_PrimitiveDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_PrimitiveDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -9728,7 +9800,7 @@ TAO_CORBA_PrimitiveDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned i
     }
   return 0;
 }
-/* ending time is 20:17:33 */
+/* ending time is 22:45:31 */
 static TAO_CORBA_PrimitiveDef_Perfect_Hash_OpTable tao_CORBA_PrimitiveDef_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
@@ -10037,12 +10109,12 @@ void POA_CORBA_PrimitiveDef::_get_kind_skel (
   POA_CORBA_PrimitiveDef *_tao_impl =
     ACE_static_cast (POA_CORBA_PrimitiveDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA::PrimitiveKind _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -10104,6 +10176,9 @@ void POA_CORBA_PrimitiveDef::_get_kind_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -10273,9 +10348,9 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 20:17:33 */
+/* starting time is 22:45:32 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /export/project/valinor/ossama/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_StringDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_StringDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_StringDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -10391,7 +10466,7 @@ TAO_CORBA_StringDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
     }
   return 0;
 }
-/* ending time is 20:17:33 */
+/* ending time is 22:45:32 */
 static TAO_CORBA_StringDef_Perfect_Hash_OpTable tao_CORBA_StringDef_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
@@ -10858,12 +10933,12 @@ void POA_CORBA_StringDef::_get_bound_skel (
   POA_CORBA_StringDef *_tao_impl =
     ACE_static_cast (POA_CORBA_StringDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA::ULong _tao_retval = 0;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -10925,6 +11000,9 @@ void POA_CORBA_StringDef::_get_bound_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -10940,9 +11018,6 @@ void POA_CORBA_StringDef::_set_bound_skel (
   POA_CORBA_StringDef *_tao_impl =
     ACE_static_cast (POA_CORBA_StringDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
   _tao_server_request.argument_flag (0);
     CORBA::ULong bound;
   if (!(
@@ -10952,6 +11027,9 @@ void POA_CORBA_StringDef::_set_bound_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -11006,6 +11084,9 @@ void POA_CORBA_StringDef::_set_bound_skel (
   
   _tao_server_request.init_reply ();
   
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -11175,9 +11256,9 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 20:17:33 */
+/* starting time is 22:45:32 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /export/project/valinor/ossama/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_WstringDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_WstringDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_WstringDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -11293,7 +11374,7 @@ TAO_CORBA_WstringDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
     }
   return 0;
 }
-/* ending time is 20:17:33 */
+/* ending time is 22:45:33 */
 static TAO_CORBA_WstringDef_Perfect_Hash_OpTable tao_CORBA_WstringDef_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
@@ -11760,12 +11841,12 @@ void POA_CORBA_WstringDef::_get_bound_skel (
   POA_CORBA_WstringDef *_tao_impl =
     ACE_static_cast (POA_CORBA_WstringDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA::ULong _tao_retval = 0;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -11827,6 +11908,9 @@ void POA_CORBA_WstringDef::_get_bound_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -11842,9 +11926,6 @@ void POA_CORBA_WstringDef::_set_bound_skel (
   POA_CORBA_WstringDef *_tao_impl =
     ACE_static_cast (POA_CORBA_WstringDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
   _tao_server_request.argument_flag (0);
     CORBA::ULong bound;
   if (!(
@@ -11854,6 +11935,9 @@ void POA_CORBA_WstringDef::_set_bound_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -11908,6 +11992,9 @@ void POA_CORBA_WstringDef::_set_bound_skel (
   
   _tao_server_request.init_reply ();
   
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -12077,9 +12164,9 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 20:17:33 */
+/* starting time is 22:45:34 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /export/project/valinor/ossama/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_SequenceDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_SequenceDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_SequenceDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -12195,7 +12282,7 @@ TAO_CORBA_SequenceDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned in
     }
   return 0;
 }
-/* ending time is 20:17:33 */
+/* ending time is 22:45:34 */
 static TAO_CORBA_SequenceDef_Perfect_Hash_OpTable tao_CORBA_SequenceDef_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
@@ -13132,12 +13219,12 @@ void POA_CORBA_SequenceDef::_get_bound_skel (
   POA_CORBA_SequenceDef *_tao_impl =
     ACE_static_cast (POA_CORBA_SequenceDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA::ULong _tao_retval = 0;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -13199,6 +13286,9 @@ void POA_CORBA_SequenceDef::_get_bound_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -13214,9 +13304,6 @@ void POA_CORBA_SequenceDef::_set_bound_skel (
   POA_CORBA_SequenceDef *_tao_impl =
     ACE_static_cast (POA_CORBA_SequenceDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
   _tao_server_request.argument_flag (0);
     CORBA::ULong bound;
   if (!(
@@ -13226,6 +13313,9 @@ void POA_CORBA_SequenceDef::_set_bound_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -13280,6 +13370,9 @@ void POA_CORBA_SequenceDef::_set_bound_skel (
   
   _tao_server_request.init_reply ();
   
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -13294,12 +13387,12 @@ void POA_CORBA_SequenceDef::_get_element_type_skel (
   POA_CORBA_SequenceDef *_tao_impl =
     ACE_static_cast (POA_CORBA_SequenceDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA::TypeCode_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -13362,6 +13455,9 @@ void POA_CORBA_SequenceDef::_get_element_type_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -13376,12 +13472,12 @@ void POA_CORBA_SequenceDef::_get_element_type_def_skel (
   POA_CORBA_SequenceDef *_tao_impl =
     ACE_static_cast (POA_CORBA_SequenceDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA_IDLType_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -13444,6 +13540,9 @@ void POA_CORBA_SequenceDef::_get_element_type_def_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -13459,9 +13558,6 @@ void POA_CORBA_SequenceDef::_set_element_type_def_skel (
   POA_CORBA_SequenceDef *_tao_impl =
     ACE_static_cast (POA_CORBA_SequenceDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
   _tao_server_request.argument_flag (0);
     CORBA_IDLType_var element_type_def;
   if (!(
@@ -13471,6 +13567,9 @@ void POA_CORBA_SequenceDef::_set_element_type_def_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -13525,6 +13624,9 @@ void POA_CORBA_SequenceDef::_set_element_type_def_skel (
   
   _tao_server_request.init_reply ();
   
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -13694,9 +13796,9 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 20:17:33 */
+/* starting time is 22:45:35 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /export/project/valinor/ossama/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ArrayDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ArrayDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ArrayDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -13815,7 +13917,7 @@ TAO_CORBA_ArrayDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int l
     }
   return 0;
 }
-/* ending time is 20:17:33 */
+/* ending time is 22:45:35 */
 static TAO_CORBA_ArrayDef_Perfect_Hash_OpTable tao_CORBA_ArrayDef_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
@@ -14752,12 +14854,12 @@ void POA_CORBA_ArrayDef::_get_length_skel (
   POA_CORBA_ArrayDef *_tao_impl =
     ACE_static_cast (POA_CORBA_ArrayDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA::ULong _tao_retval = 0;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -14819,6 +14921,9 @@ void POA_CORBA_ArrayDef::_get_length_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -14834,9 +14939,6 @@ void POA_CORBA_ArrayDef::_set_length_skel (
   POA_CORBA_ArrayDef *_tao_impl =
     ACE_static_cast (POA_CORBA_ArrayDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
   _tao_server_request.argument_flag (0);
     CORBA::ULong length;
   if (!(
@@ -14846,6 +14948,9 @@ void POA_CORBA_ArrayDef::_set_length_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -14900,6 +15005,9 @@ void POA_CORBA_ArrayDef::_set_length_skel (
   
   _tao_server_request.init_reply ();
   
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -14914,12 +15022,12 @@ void POA_CORBA_ArrayDef::_get_element_type_skel (
   POA_CORBA_ArrayDef *_tao_impl =
     ACE_static_cast (POA_CORBA_ArrayDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA::TypeCode_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -14982,6 +15090,9 @@ void POA_CORBA_ArrayDef::_get_element_type_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -14996,12 +15107,12 @@ void POA_CORBA_ArrayDef::_get_element_type_def_skel (
   POA_CORBA_ArrayDef *_tao_impl =
     ACE_static_cast (POA_CORBA_ArrayDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA_IDLType_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -15064,6 +15175,9 @@ void POA_CORBA_ArrayDef::_get_element_type_def_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -15079,9 +15193,6 @@ void POA_CORBA_ArrayDef::_set_element_type_def_skel (
   POA_CORBA_ArrayDef *_tao_impl =
     ACE_static_cast (POA_CORBA_ArrayDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
   _tao_server_request.argument_flag (0);
     CORBA_IDLType_var element_type_def;
   if (!(
@@ -15091,6 +15202,9 @@ void POA_CORBA_ArrayDef::_set_element_type_def_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -15145,6 +15259,9 @@ void POA_CORBA_ArrayDef::_set_element_type_def_skel (
   
   _tao_server_request.init_reply ();
   
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -15314,9 +15431,9 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 20:17:34 */
+/* starting time is 22:45:36 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /export/project/valinor/ossama/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ExceptionDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ExceptionDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ExceptionDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -15463,7 +15580,7 @@ TAO_CORBA_ExceptionDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned i
     }
   return 0;
 }
-/* ending time is 20:17:34 */
+/* ending time is 22:45:36 */
 static TAO_CORBA_ExceptionDef_Perfect_Hash_OpTable tao_CORBA_ExceptionDef_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
@@ -16087,12 +16204,12 @@ void POA_CORBA_ExceptionDef::_get_type_skel (
   POA_CORBA_ExceptionDef *_tao_impl =
     ACE_static_cast (POA_CORBA_ExceptionDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA::TypeCode_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -16155,6 +16272,9 @@ void POA_CORBA_ExceptionDef::_get_type_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -16169,12 +16289,12 @@ void POA_CORBA_ExceptionDef::_get_members_skel (
   POA_CORBA_ExceptionDef *_tao_impl =
     ACE_static_cast (POA_CORBA_ExceptionDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA_StructMemberSeq_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -16237,6 +16357,9 @@ void POA_CORBA_ExceptionDef::_get_members_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -16252,9 +16375,6 @@ void POA_CORBA_ExceptionDef::_set_members_skel (
   POA_CORBA_ExceptionDef *_tao_impl =
     ACE_static_cast (POA_CORBA_ExceptionDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
   _tao_server_request.argument_flag (0);
     CORBA_StructMemberSeq members;
   if (!(
@@ -16264,6 +16384,9 @@ void POA_CORBA_ExceptionDef::_set_members_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -16318,6 +16441,9 @@ void POA_CORBA_ExceptionDef::_set_members_skel (
   
   _tao_server_request.init_reply ();
   
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -16490,9 +16616,9 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 20:17:34 */
+/* starting time is 22:45:38 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /export/project/valinor/ossama/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_AttributeDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_AttributeDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_AttributeDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -16622,7 +16748,7 @@ TAO_CORBA_AttributeDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned i
     }
   return 0;
 }
-/* ending time is 20:17:34 */
+/* ending time is 22:45:38 */
 static TAO_CORBA_AttributeDef_Perfect_Hash_OpTable tao_CORBA_AttributeDef_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
@@ -17559,12 +17685,12 @@ void POA_CORBA_AttributeDef::_get_type_skel (
   POA_CORBA_AttributeDef *_tao_impl =
     ACE_static_cast (POA_CORBA_AttributeDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA::TypeCode_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -17627,6 +17753,9 @@ void POA_CORBA_AttributeDef::_get_type_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -17641,12 +17770,12 @@ void POA_CORBA_AttributeDef::_get_type_def_skel (
   POA_CORBA_AttributeDef *_tao_impl =
     ACE_static_cast (POA_CORBA_AttributeDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA_IDLType_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -17709,6 +17838,9 @@ void POA_CORBA_AttributeDef::_get_type_def_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -17724,9 +17856,6 @@ void POA_CORBA_AttributeDef::_set_type_def_skel (
   POA_CORBA_AttributeDef *_tao_impl =
     ACE_static_cast (POA_CORBA_AttributeDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
   _tao_server_request.argument_flag (0);
     CORBA_IDLType_var type_def;
   if (!(
@@ -17736,6 +17865,9 @@ void POA_CORBA_AttributeDef::_set_type_def_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -17790,6 +17922,9 @@ void POA_CORBA_AttributeDef::_set_type_def_skel (
   
   _tao_server_request.init_reply ();
   
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -17804,12 +17939,12 @@ void POA_CORBA_AttributeDef::_get_mode_skel (
   POA_CORBA_AttributeDef *_tao_impl =
     ACE_static_cast (POA_CORBA_AttributeDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA::AttributeMode _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -17871,6 +18006,9 @@ void POA_CORBA_AttributeDef::_get_mode_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -17886,9 +18024,6 @@ void POA_CORBA_AttributeDef::_set_mode_skel (
   POA_CORBA_AttributeDef *_tao_impl =
     ACE_static_cast (POA_CORBA_AttributeDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
   _tao_server_request.argument_flag (0);
     CORBA::AttributeMode mode;
   if (!(
@@ -17898,6 +18033,9 @@ void POA_CORBA_AttributeDef::_set_mode_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -17952,6 +18090,9 @@ void POA_CORBA_AttributeDef::_set_mode_skel (
   
   _tao_server_request.init_reply ();
   
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -18121,9 +18262,9 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 20:17:34 */
+/* starting time is 22:45:39 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /export/project/valinor/ossama/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_OperationDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_OperationDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_OperationDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -18310,7 +18451,7 @@ TAO_CORBA_OperationDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned i
     }
   return 0;
 }
-/* ending time is 20:17:34 */
+/* ending time is 22:45:39 */
 static TAO_CORBA_OperationDef_Perfect_Hash_OpTable tao_CORBA_OperationDef_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
@@ -20189,12 +20330,12 @@ void POA_CORBA_OperationDef::_get_result_skel (
   POA_CORBA_OperationDef *_tao_impl =
     ACE_static_cast (POA_CORBA_OperationDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA::TypeCode_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -20257,6 +20398,9 @@ void POA_CORBA_OperationDef::_get_result_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -20271,12 +20415,12 @@ void POA_CORBA_OperationDef::_get_result_def_skel (
   POA_CORBA_OperationDef *_tao_impl =
     ACE_static_cast (POA_CORBA_OperationDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA_IDLType_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -20339,6 +20483,9 @@ void POA_CORBA_OperationDef::_get_result_def_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -20354,9 +20501,6 @@ void POA_CORBA_OperationDef::_set_result_def_skel (
   POA_CORBA_OperationDef *_tao_impl =
     ACE_static_cast (POA_CORBA_OperationDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
   _tao_server_request.argument_flag (0);
     CORBA_IDLType_var result_def;
   if (!(
@@ -20366,6 +20510,9 @@ void POA_CORBA_OperationDef::_set_result_def_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -20420,6 +20567,9 @@ void POA_CORBA_OperationDef::_set_result_def_skel (
   
   _tao_server_request.init_reply ();
   
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -20434,12 +20584,12 @@ void POA_CORBA_OperationDef::_get_params_skel (
   POA_CORBA_OperationDef *_tao_impl =
     ACE_static_cast (POA_CORBA_OperationDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA_ParDescriptionSeq_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -20502,6 +20652,9 @@ void POA_CORBA_OperationDef::_get_params_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -20517,9 +20670,6 @@ void POA_CORBA_OperationDef::_set_params_skel (
   POA_CORBA_OperationDef *_tao_impl =
     ACE_static_cast (POA_CORBA_OperationDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
   _tao_server_request.argument_flag (0);
     CORBA_ParDescriptionSeq params;
   if (!(
@@ -20529,6 +20679,9 @@ void POA_CORBA_OperationDef::_set_params_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -20583,6 +20736,9 @@ void POA_CORBA_OperationDef::_set_params_skel (
   
   _tao_server_request.init_reply ();
   
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -20597,12 +20753,12 @@ void POA_CORBA_OperationDef::_get_mode_skel (
   POA_CORBA_OperationDef *_tao_impl =
     ACE_static_cast (POA_CORBA_OperationDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA::OperationMode _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -20664,6 +20820,9 @@ void POA_CORBA_OperationDef::_get_mode_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -20679,9 +20838,6 @@ void POA_CORBA_OperationDef::_set_mode_skel (
   POA_CORBA_OperationDef *_tao_impl =
     ACE_static_cast (POA_CORBA_OperationDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
   _tao_server_request.argument_flag (0);
     CORBA::OperationMode mode;
   if (!(
@@ -20691,6 +20847,9 @@ void POA_CORBA_OperationDef::_set_mode_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -20745,6 +20904,9 @@ void POA_CORBA_OperationDef::_set_mode_skel (
   
   _tao_server_request.init_reply ();
   
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -20759,12 +20921,12 @@ void POA_CORBA_OperationDef::_get_contexts_skel (
   POA_CORBA_OperationDef *_tao_impl =
     ACE_static_cast (POA_CORBA_OperationDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA_ContextIdSeq_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -20827,6 +20989,9 @@ void POA_CORBA_OperationDef::_get_contexts_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -20842,9 +21007,6 @@ void POA_CORBA_OperationDef::_set_contexts_skel (
   POA_CORBA_OperationDef *_tao_impl =
     ACE_static_cast (POA_CORBA_OperationDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
   _tao_server_request.argument_flag (0);
     CORBA_ContextIdSeq contexts;
   if (!(
@@ -20854,6 +21016,9 @@ void POA_CORBA_OperationDef::_set_contexts_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -20908,6 +21073,9 @@ void POA_CORBA_OperationDef::_set_contexts_skel (
   
   _tao_server_request.init_reply ();
   
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -20922,12 +21090,12 @@ void POA_CORBA_OperationDef::_get_exceptions_skel (
   POA_CORBA_OperationDef *_tao_impl =
     ACE_static_cast (POA_CORBA_OperationDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA_ExceptionDefSeq_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -20990,6 +21158,9 @@ void POA_CORBA_OperationDef::_get_exceptions_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -21005,9 +21176,6 @@ void POA_CORBA_OperationDef::_set_exceptions_skel (
   POA_CORBA_OperationDef *_tao_impl =
     ACE_static_cast (POA_CORBA_OperationDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
   _tao_server_request.argument_flag (0);
     CORBA_ExceptionDefSeq exceptions;
   if (!(
@@ -21017,6 +21185,9 @@ void POA_CORBA_OperationDef::_set_exceptions_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -21071,6 +21242,9 @@ void POA_CORBA_OperationDef::_set_exceptions_skel (
   
   _tao_server_request.init_reply ();
   
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -21240,9 +21414,9 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 20:17:34 */
+/* starting time is 22:45:40 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /export/project/valinor/ossama/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_InterfaceDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_InterfaceDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_InterfaceDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -21394,7 +21568,7 @@ TAO_CORBA_InterfaceDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned i
     }
   return 0;
 }
-/* ending time is 20:17:34 */
+/* ending time is 22:45:41 */
 static TAO_CORBA_InterfaceDef_Perfect_Hash_OpTable tao_CORBA_InterfaceDef_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
@@ -22631,12 +22805,12 @@ void POA_CORBA_InterfaceDef::_get_base_interfaces_skel (
   POA_CORBA_InterfaceDef *_tao_impl =
     ACE_static_cast (POA_CORBA_InterfaceDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA_InterfaceDefSeq_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -22699,6 +22873,9 @@ void POA_CORBA_InterfaceDef::_get_base_interfaces_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -22714,9 +22891,6 @@ void POA_CORBA_InterfaceDef::_set_base_interfaces_skel (
   POA_CORBA_InterfaceDef *_tao_impl =
     ACE_static_cast (POA_CORBA_InterfaceDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
   _tao_server_request.argument_flag (0);
     CORBA_InterfaceDefSeq base_interfaces;
   if (!(
@@ -22726,6 +22900,9 @@ void POA_CORBA_InterfaceDef::_set_base_interfaces_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -22780,6 +22957,9 @@ void POA_CORBA_InterfaceDef::_set_base_interfaces_skel (
   
   _tao_server_request.init_reply ();
   
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -22795,9 +22975,6 @@ void POA_CORBA_InterfaceDef::is_a_skel (
   POA_CORBA_InterfaceDef *_tao_impl =
     ACE_static_cast (POA_CORBA_InterfaceDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA::Boolean _tao_retval = 0;
   CORBA::String_var interface_id;
   if (!(
@@ -22807,6 +22984,9 @@ void POA_CORBA_InterfaceDef::is_a_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -22870,6 +23050,9 @@ void POA_CORBA_InterfaceDef::is_a_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -22884,12 +23067,12 @@ void POA_CORBA_InterfaceDef::describe_interface_skel (
   POA_CORBA_InterfaceDef *_tao_impl =
     ACE_static_cast (POA_CORBA_InterfaceDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA_InterfaceDef::FullInterfaceDescription_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -22952,6 +23135,9 @@ void POA_CORBA_InterfaceDef::describe_interface_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -22967,9 +23153,6 @@ void POA_CORBA_InterfaceDef::create_attribute_skel (
   POA_CORBA_InterfaceDef *_tao_impl =
     ACE_static_cast (POA_CORBA_InterfaceDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA_AttributeDef_var _tao_retval;
   CORBA::String_var id;
   CORBA::String_var name;
@@ -22987,6 +23170,9 @@ void POA_CORBA_InterfaceDef::create_attribute_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -23059,6 +23245,9 @@ void POA_CORBA_InterfaceDef::create_attribute_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -23074,9 +23263,6 @@ void POA_CORBA_InterfaceDef::create_operation_skel (
   POA_CORBA_InterfaceDef *_tao_impl =
     ACE_static_cast (POA_CORBA_InterfaceDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA_OperationDef_var _tao_retval;
   CORBA::String_var id;
   CORBA::String_var name;
@@ -23100,6 +23286,9 @@ void POA_CORBA_InterfaceDef::create_operation_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -23178,6 +23367,9 @@ void POA_CORBA_InterfaceDef::create_operation_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -23353,9 +23545,9 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 20:17:34 */
+/* starting time is 22:45:42 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /export/project/valinor/ossama/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_AbstractInterfaceDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_AbstractInterfaceDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_AbstractInterfaceDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -23507,7 +23699,7 @@ TAO_CORBA_AbstractInterfaceDef_Perfect_Hash_OpTable::lookup (const char *str, un
     }
   return 0;
 }
-/* ending time is 20:17:34 */
+/* ending time is 22:45:42 */
 static TAO_CORBA_AbstractInterfaceDef_Perfect_Hash_OpTable tao_CORBA_AbstractInterfaceDef_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
@@ -23827,9 +24019,9 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 20:17:34 */
+/* starting time is 22:45:43 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /export/project/valinor/ossama/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_LocalInterfaceDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_LocalInterfaceDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_LocalInterfaceDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -23981,7 +24173,7 @@ TAO_CORBA_LocalInterfaceDef_Perfect_Hash_OpTable::lookup (const char *str, unsig
     }
   return 0;
 }
-/* ending time is 20:17:34 */
+/* ending time is 22:45:43 */
 static TAO_CORBA_LocalInterfaceDef_Perfect_Hash_OpTable tao_CORBA_LocalInterfaceDef_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
diff --git a/TAO/orbsvcs/IFR_Service/IFR_BasicS.h b/TAO/orbsvcs/IFR_Service/IFR_BasicS.h
index bd0419f8c58..fc3af925d03 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_BasicS.h
+++ b/TAO/orbsvcs/IFR_Service/IFR_BasicS.h
@@ -53,7 +53,7 @@ typedef POA_CORBA_Repository *POA_CORBA_Repository_ptr;
 class _TAO_CORBA_Repository_ThruPOA_Proxy_Impl;
 class _TAO_CORBA_Repository_Strategized_Proxy_Broker;
 
-class POA_CORBA_Repository : public virtual POA_CORBA_Container
+class  POA_CORBA_Repository : public virtual POA_CORBA_Container
 {
 protected:
   POA_CORBA_Repository (void);
@@ -65,7 +65,7 @@ public:
 
   virtual CORBA::Boolean _is_a (
       const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
@@ -101,7 +101,7 @@ public:
     );
 
   ::CORBA_Repository *_this (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
@@ -109,13 +109,13 @@ public:
 
   virtual CORBA_Contained_ptr lookup_id (
       const char * search_id,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-
+  
     static void lookup_id_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
@@ -125,13 +125,13 @@ public:
 
   virtual CORBA::TypeCode_ptr get_canonical_typecode (
       CORBA::TypeCode_ptr tc,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-
+  
     static void get_canonical_typecode_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
@@ -141,13 +141,13 @@ public:
 
   virtual CORBA_PrimitiveDef_ptr get_primitive (
       CORBA::PrimitiveKind kind,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-
+  
     static void get_primitive_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
@@ -157,13 +157,13 @@ public:
 
   virtual CORBA_StringDef_ptr create_string (
       CORBA::ULong bound,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-
+  
     static void create_string_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
@@ -173,13 +173,13 @@ public:
 
   virtual CORBA_WstringDef_ptr create_wstring (
       CORBA::ULong bound,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-
+  
     static void create_wstring_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
@@ -190,13 +190,13 @@ public:
   virtual CORBA_SequenceDef_ptr create_sequence (
       CORBA::ULong bound,
       CORBA_IDLType_ptr element_type,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-
+  
     static void create_sequence_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
@@ -207,13 +207,13 @@ public:
   virtual CORBA_ArrayDef_ptr create_array (
       CORBA::ULong length,
       CORBA_IDLType_ptr element_type,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-
+  
     static void create_array_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
@@ -224,13 +224,13 @@ public:
   virtual CORBA_FixedDef_ptr create_fixed (
       CORBA::UShort digits,
       CORBA::Short scale,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-
+  
     static void create_fixed_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
@@ -239,7 +239,7 @@ public:
     );
 
   static void lookup_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -247,7 +247,7 @@ public:
     );
 
   static void contents_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -255,7 +255,7 @@ public:
     );
 
   static void lookup_name_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -263,7 +263,7 @@ public:
     );
 
   static void describe_contents_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -271,7 +271,7 @@ public:
     );
 
   static void create_module_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -279,7 +279,7 @@ public:
     );
 
   static void create_constant_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -287,7 +287,7 @@ public:
     );
 
   static void create_struct_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -295,7 +295,7 @@ public:
     );
 
   static void create_union_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -303,7 +303,7 @@ public:
     );
 
   static void create_enum_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -311,7 +311,7 @@ public:
     );
 
   static void create_alias_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -319,7 +319,7 @@ public:
     );
 
   static void create_interface_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -327,7 +327,7 @@ public:
     );
 
   static void create_value_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -335,7 +335,7 @@ public:
     );
 
   static void create_value_box_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -343,7 +343,7 @@ public:
     );
 
   static void create_exception_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -351,7 +351,7 @@ public:
     );
 
   static void create_native_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -359,7 +359,7 @@ public:
     );
 
   static void create_abstract_interface_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -367,7 +367,7 @@ public:
     );
 
   static void create_local_interface_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -383,7 +383,7 @@ public:
     );
 
   static void destroy_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -395,16 +395,16 @@ public:
 
 
 ///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration
+//               Strategized Proxy Broker Declaration 
 //
 
-class _TAO_CORBA_Repository_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_Repository_Proxy_Broker
+class  _TAO_CORBA_Repository_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_Repository_Proxy_Broker
 {
-public:
+public: 
   _TAO_CORBA_Repository_Strategized_Proxy_Broker (void);
-
+  
   virtual ~_TAO_CORBA_Repository_Strategized_Proxy_Broker (void);
-
+  
   virtual ::_TAO_CORBA_Repository_Proxy_Impl &select_proxy (
     ::CORBA_Repository *object,
     CORBA_Environment &ACE_TRY_ENV
@@ -418,15 +418,15 @@ private:
     int collocation_strategy,
     CORBA::Environment &ACE_TRY_ENV
   );
-
+  
 private:
-
+  
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
   ::_TAO_CORBA_Repository_Proxy_Impl
   *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-
+  
   TAO_SYNCH_MUTEX mutex_;
   // This funxtion is used to get an handle to the unique instance
   // of the Strategized Proxy Broker that is available for a given
@@ -438,7 +438,7 @@ public:
 
 
 //
-//            End Strategized Proxy Broker Declaration
+//            End Strategized Proxy Broker Declaration 
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -446,17 +446,17 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class _TAO_CORBA_Repository_ThruPOA_Proxy_Impl :
+class  _TAO_CORBA_Repository_ThruPOA_Proxy_Impl : 
   public virtual ::_TAO_CORBA_Repository_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
   public virtual ::_TAO_CORBA_Container_ThruPOA_Proxy_Impl
-
+  
 {
 public:
   _TAO_CORBA_Repository_ThruPOA_Proxy_Impl (void);
-
+  
   virtual ~_TAO_CORBA_Repository_ThruPOA_Proxy_Impl (void) { }
-
+  
   virtual CORBA_Contained_ptr lookup_id (
       CORBA_Object *_collocated_tao_target_,
       const char * search_id,
@@ -465,7 +465,7 @@ public:
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-
+  
   virtual CORBA::TypeCode_ptr get_canonical_typecode (
       CORBA_Object *_collocated_tao_target_,
       CORBA::TypeCode_ptr tc,
@@ -474,7 +474,7 @@ public:
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-
+  
   virtual CORBA_PrimitiveDef_ptr get_primitive (
       CORBA_Object *_collocated_tao_target_,
       CORBA::PrimitiveKind kind,
@@ -483,7 +483,7 @@ public:
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-
+  
   virtual CORBA_StringDef_ptr create_string (
       CORBA_Object *_collocated_tao_target_,
       CORBA::ULong bound,
@@ -492,7 +492,7 @@ public:
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-
+  
   virtual CORBA_WstringDef_ptr create_wstring (
       CORBA_Object *_collocated_tao_target_,
       CORBA::ULong bound,
@@ -501,7 +501,7 @@ public:
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-
+  
   virtual CORBA_SequenceDef_ptr create_sequence (
       CORBA_Object *_collocated_tao_target_,
       CORBA::ULong bound,
@@ -511,7 +511,7 @@ public:
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-
+  
   virtual CORBA_ArrayDef_ptr create_array (
       CORBA_Object *_collocated_tao_target_,
       CORBA::ULong length,
@@ -521,7 +521,7 @@ public:
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-
+  
   virtual CORBA_FixedDef_ptr create_fixed (
       CORBA_Object *_collocated_tao_target_,
       CORBA::UShort digits,
@@ -531,8 +531,8 @@ public:
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-
-
+  
+  
 };
 
 //
@@ -546,7 +546,7 @@ typedef POA_CORBA_ModuleDef *POA_CORBA_ModuleDef_ptr;
 class _TAO_CORBA_ModuleDef_ThruPOA_Proxy_Impl;
 class _TAO_CORBA_ModuleDef_Strategized_Proxy_Broker;
 
-class POA_CORBA_ModuleDef : public virtual POA_CORBA_Container, public virtual POA_CORBA_Contained
+class  POA_CORBA_ModuleDef : public virtual POA_CORBA_Container, public virtual POA_CORBA_Contained
 {
 protected:
   POA_CORBA_ModuleDef (void);
@@ -558,7 +558,7 @@ public:
 
   virtual CORBA::Boolean _is_a (
       const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
@@ -594,14 +594,14 @@ public:
     );
 
   ::CORBA_ModuleDef *_this (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
   virtual const char* _interface_repository_id (void) const;
 
   static void lookup_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -609,7 +609,7 @@ public:
     );
 
   static void contents_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -617,7 +617,7 @@ public:
     );
 
   static void lookup_name_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -625,7 +625,7 @@ public:
     );
 
   static void describe_contents_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -633,7 +633,7 @@ public:
     );
 
   static void create_module_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -641,7 +641,7 @@ public:
     );
 
   static void create_constant_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -649,7 +649,7 @@ public:
     );
 
   static void create_struct_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -657,7 +657,7 @@ public:
     );
 
   static void create_union_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -665,7 +665,7 @@ public:
     );
 
   static void create_enum_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -673,7 +673,7 @@ public:
     );
 
   static void create_alias_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -681,7 +681,7 @@ public:
     );
 
   static void create_interface_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -689,7 +689,7 @@ public:
     );
 
   static void create_value_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -697,7 +697,7 @@ public:
     );
 
   static void create_value_box_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -705,7 +705,7 @@ public:
     );
 
   static void create_exception_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -713,7 +713,7 @@ public:
     );
 
   static void create_native_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -721,7 +721,7 @@ public:
     );
 
   static void create_abstract_interface_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -729,7 +729,7 @@ public:
     );
 
   static void create_local_interface_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -748,7 +748,7 @@ public:
       TAO_ServerRequest &req,
       void *obj,
       void *context,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
@@ -764,7 +764,7 @@ public:
       TAO_ServerRequest &req,
       void *obj,
       void *context,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
@@ -780,7 +780,7 @@ public:
       TAO_ServerRequest &req,
       void *obj,
       void *context,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
@@ -809,7 +809,7 @@ public:
     );
 
   static void describe_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -817,7 +817,7 @@ public:
     );
 
   static void move_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -833,7 +833,7 @@ public:
     );
 
   static void destroy_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -845,16 +845,16 @@ public:
 
 
 ///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration
+//               Strategized Proxy Broker Declaration 
 //
 
-class _TAO_CORBA_ModuleDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_ModuleDef_Proxy_Broker
+class  _TAO_CORBA_ModuleDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_ModuleDef_Proxy_Broker
 {
-public:
+public: 
   _TAO_CORBA_ModuleDef_Strategized_Proxy_Broker (void);
-
+  
   virtual ~_TAO_CORBA_ModuleDef_Strategized_Proxy_Broker (void);
-
+  
   virtual ::_TAO_CORBA_ModuleDef_Proxy_Impl &select_proxy (
     ::CORBA_ModuleDef *object,
     CORBA_Environment &ACE_TRY_ENV
@@ -868,15 +868,15 @@ private:
     int collocation_strategy,
     CORBA::Environment &ACE_TRY_ENV
   );
-
+  
 private:
-
+  
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
   ::_TAO_CORBA_ModuleDef_Proxy_Impl
   *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-
+  
   TAO_SYNCH_MUTEX mutex_;
   // This funxtion is used to get an handle to the unique instance
   // of the Strategized Proxy Broker that is available for a given
@@ -888,7 +888,7 @@ public:
 
 
 //
-//            End Strategized Proxy Broker Declaration
+//            End Strategized Proxy Broker Declaration 
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -896,18 +896,18 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class _TAO_CORBA_ModuleDef_ThruPOA_Proxy_Impl :
+class  _TAO_CORBA_ModuleDef_ThruPOA_Proxy_Impl : 
   public virtual ::_TAO_CORBA_ModuleDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-  public virtual ::_TAO_CORBA_Container_ThruPOA_Proxy_Impl,
+  public virtual ::_TAO_CORBA_Container_ThruPOA_Proxy_Impl, 
   public virtual ::_TAO_CORBA_Contained_ThruPOA_Proxy_Impl
-
+  
 {
 public:
   _TAO_CORBA_ModuleDef_ThruPOA_Proxy_Impl (void);
-
+  
   virtual ~_TAO_CORBA_ModuleDef_ThruPOA_Proxy_Impl (void) { }
-
+  
 };
 
 
@@ -921,7 +921,7 @@ typedef POA_CORBA_ConstantDef *POA_CORBA_ConstantDef_ptr;
 class _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl;
 class _TAO_CORBA_ConstantDef_Strategized_Proxy_Broker;
 
-class POA_CORBA_ConstantDef : public virtual POA_CORBA_Contained
+class  POA_CORBA_ConstantDef : public virtual POA_CORBA_Contained
 {
 protected:
   POA_CORBA_ConstantDef (void);
@@ -933,7 +933,7 @@ public:
 
   virtual CORBA::Boolean _is_a (
       const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
@@ -969,20 +969,20 @@ public:
     );
 
   ::CORBA_ConstantDef *_this (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
   virtual const char* _interface_repository_id (void) const;
 
   virtual CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-
+  
     static void _get_type_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
@@ -991,13 +991,13 @@ public:
     );
 
   virtual CORBA_IDLType_ptr type_def (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-
+  
     static void _get_type_def_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
@@ -1007,13 +1007,13 @@ public:
 
   virtual void type_def (
       CORBA_IDLType_ptr type_def,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-
+  
     static void _set_type_def_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
@@ -1022,13 +1022,13 @@ public:
     );
 
   virtual CORBA::Any * value (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-
+  
     static void _get_value_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
@@ -1038,13 +1038,13 @@ public:
 
   virtual void value (
       const CORBA::Any & value,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-
+  
     static void _set_value_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
@@ -1064,7 +1064,7 @@ public:
       TAO_ServerRequest &req,
       void *obj,
       void *context,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
@@ -1080,7 +1080,7 @@ public:
       TAO_ServerRequest &req,
       void *obj,
       void *context,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
@@ -1096,7 +1096,7 @@ public:
       TAO_ServerRequest &req,
       void *obj,
       void *context,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
@@ -1125,7 +1125,7 @@ public:
     );
 
   static void describe_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -1133,7 +1133,7 @@ public:
     );
 
   static void move_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -1149,7 +1149,7 @@ public:
     );
 
   static void destroy_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -1161,16 +1161,16 @@ public:
 
 
 ///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration
+//               Strategized Proxy Broker Declaration 
 //
 
-class _TAO_CORBA_ConstantDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_ConstantDef_Proxy_Broker
+class  _TAO_CORBA_ConstantDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_ConstantDef_Proxy_Broker
 {
-public:
+public: 
   _TAO_CORBA_ConstantDef_Strategized_Proxy_Broker (void);
-
+  
   virtual ~_TAO_CORBA_ConstantDef_Strategized_Proxy_Broker (void);
-
+  
   virtual ::_TAO_CORBA_ConstantDef_Proxy_Impl &select_proxy (
     ::CORBA_ConstantDef *object,
     CORBA_Environment &ACE_TRY_ENV
@@ -1184,15 +1184,15 @@ private:
     int collocation_strategy,
     CORBA::Environment &ACE_TRY_ENV
   );
-
+  
 private:
-
+  
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
   ::_TAO_CORBA_ConstantDef_Proxy_Impl
   *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-
+  
   TAO_SYNCH_MUTEX mutex_;
   // This funxtion is used to get an handle to the unique instance
   // of the Strategized Proxy Broker that is available for a given
@@ -1204,7 +1204,7 @@ public:
 
 
 //
-//            End Strategized Proxy Broker Declaration
+//            End Strategized Proxy Broker Declaration 
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -1212,17 +1212,17 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl :
+class  _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl : 
   public virtual ::_TAO_CORBA_ConstantDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
   public virtual ::_TAO_CORBA_Contained_ThruPOA_Proxy_Impl
-
+  
 {
 public:
   _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl (void);
-
+  
   virtual ~_TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl (void) { }
-
+  
   virtual CORBA::TypeCode_ptr type (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
@@ -1230,7 +1230,7 @@ public:
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-
+  
   virtual CORBA_IDLType_ptr type_def (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
@@ -1238,7 +1238,7 @@ public:
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-
+  
   virtual void type_def (
       CORBA_Object *_collocated_tao_target_,
       CORBA_IDLType_ptr type_def,
@@ -1247,7 +1247,7 @@ public:
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-
+  
   virtual CORBA::Any * value (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
@@ -1255,7 +1255,7 @@ public:
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-
+  
   virtual void value (
       CORBA_Object *_collocated_tao_target_,
       const CORBA::Any & value,
@@ -1264,8 +1264,8 @@ public:
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-
-
+  
+  
 };
 
 //
@@ -1279,7 +1279,7 @@ typedef POA_CORBA_StructDef *POA_CORBA_StructDef_ptr;
 class _TAO_CORBA_StructDef_ThruPOA_Proxy_Impl;
 class _TAO_CORBA_StructDef_Strategized_Proxy_Broker;
 
-class POA_CORBA_StructDef : public virtual POA_CORBA_TypedefDef, public virtual POA_CORBA_Container
+class  POA_CORBA_StructDef : public virtual POA_CORBA_TypedefDef, public virtual POA_CORBA_Container
 {
 protected:
   POA_CORBA_StructDef (void);
@@ -1291,7 +1291,7 @@ public:
 
   virtual CORBA::Boolean _is_a (
       const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
@@ -1327,20 +1327,20 @@ public:
     );
 
   ::CORBA_StructDef *_this (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
   virtual const char* _interface_repository_id (void) const;
 
   virtual CORBA_StructMemberSeq * members (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-
+  
     static void _get_members_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
@@ -1350,13 +1350,13 @@ public:
 
   virtual void members (
       const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-
+  
     static void _set_members_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
@@ -1365,7 +1365,7 @@ public:
     );
 
   static void lookup_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -1373,7 +1373,7 @@ public:
     );
 
   static void contents_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -1381,7 +1381,7 @@ public:
     );
 
   static void lookup_name_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -1389,7 +1389,7 @@ public:
     );
 
   static void describe_contents_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -1397,7 +1397,7 @@ public:
     );
 
   static void create_module_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -1405,7 +1405,7 @@ public:
     );
 
   static void create_constant_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -1413,7 +1413,7 @@ public:
     );
 
   static void create_struct_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -1421,7 +1421,7 @@ public:
     );
 
   static void create_union_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -1429,7 +1429,7 @@ public:
     );
 
   static void create_enum_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -1437,7 +1437,7 @@ public:
     );
 
   static void create_alias_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -1445,7 +1445,7 @@ public:
     );
 
   static void create_interface_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -1453,7 +1453,7 @@ public:
     );
 
   static void create_value_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -1461,7 +1461,7 @@ public:
     );
 
   static void create_value_box_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -1469,7 +1469,7 @@ public:
     );
 
   static void create_exception_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -1477,7 +1477,7 @@ public:
     );
 
   static void create_native_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -1485,7 +1485,7 @@ public:
     );
 
   static void create_abstract_interface_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -1493,7 +1493,7 @@ public:
     );
 
   static void create_local_interface_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -1512,7 +1512,7 @@ public:
       TAO_ServerRequest &req,
       void *obj,
       void *context,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
@@ -1528,7 +1528,7 @@ public:
       TAO_ServerRequest &req,
       void *obj,
       void *context,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
@@ -1544,7 +1544,7 @@ public:
       TAO_ServerRequest &req,
       void *obj,
       void *context,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
@@ -1573,7 +1573,7 @@ public:
     );
 
   static void describe_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -1581,7 +1581,7 @@ public:
     );
 
   static void move_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -1605,7 +1605,7 @@ public:
     );
 
   static void destroy_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -1617,16 +1617,16 @@ public:
 
 
 ///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration
+//               Strategized Proxy Broker Declaration 
 //
 
-class _TAO_CORBA_StructDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_StructDef_Proxy_Broker
+class  _TAO_CORBA_StructDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_StructDef_Proxy_Broker
 {
-public:
+public: 
   _TAO_CORBA_StructDef_Strategized_Proxy_Broker (void);
-
+  
   virtual ~_TAO_CORBA_StructDef_Strategized_Proxy_Broker (void);
-
+  
   virtual ::_TAO_CORBA_StructDef_Proxy_Impl &select_proxy (
     ::CORBA_StructDef *object,
     CORBA_Environment &ACE_TRY_ENV
@@ -1640,15 +1640,15 @@ private:
     int collocation_strategy,
     CORBA::Environment &ACE_TRY_ENV
   );
-
+  
 private:
-
+  
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
   ::_TAO_CORBA_StructDef_Proxy_Impl
   *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-
+  
   TAO_SYNCH_MUTEX mutex_;
   // This funxtion is used to get an handle to the unique instance
   // of the Strategized Proxy Broker that is available for a given
@@ -1660,7 +1660,7 @@ public:
 
 
 //
-//            End Strategized Proxy Broker Declaration
+//            End Strategized Proxy Broker Declaration 
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -1668,18 +1668,18 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class _TAO_CORBA_StructDef_ThruPOA_Proxy_Impl :
+class  _TAO_CORBA_StructDef_ThruPOA_Proxy_Impl : 
   public virtual ::_TAO_CORBA_StructDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-  public virtual ::_TAO_CORBA_TypedefDef_ThruPOA_Proxy_Impl,
+  public virtual ::_TAO_CORBA_TypedefDef_ThruPOA_Proxy_Impl, 
   public virtual ::_TAO_CORBA_Container_ThruPOA_Proxy_Impl
-
+  
 {
 public:
   _TAO_CORBA_StructDef_ThruPOA_Proxy_Impl (void);
-
+  
   virtual ~_TAO_CORBA_StructDef_ThruPOA_Proxy_Impl (void) { }
-
+  
   virtual CORBA_StructMemberSeq * members (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
@@ -1687,7 +1687,7 @@ public:
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-
+  
   virtual void members (
       CORBA_Object *_collocated_tao_target_,
       const CORBA_StructMemberSeq & members,
@@ -1696,8 +1696,8 @@ public:
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-
-
+  
+  
 };
 
 //
@@ -1711,7 +1711,7 @@ typedef POA_CORBA_UnionDef *POA_CORBA_UnionDef_ptr;
 class _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl;
 class _TAO_CORBA_UnionDef_Strategized_Proxy_Broker;
 
-class POA_CORBA_UnionDef : public virtual POA_CORBA_TypedefDef, public virtual POA_CORBA_Container
+class  POA_CORBA_UnionDef : public virtual POA_CORBA_TypedefDef, public virtual POA_CORBA_Container
 {
 protected:
   POA_CORBA_UnionDef (void);
@@ -1723,7 +1723,7 @@ public:
 
   virtual CORBA::Boolean _is_a (
       const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
@@ -1759,20 +1759,20 @@ public:
     );
 
   ::CORBA_UnionDef *_this (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
   virtual const char* _interface_repository_id (void) const;
 
   virtual CORBA::TypeCode_ptr discriminator_type (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-
+  
     static void _get_discriminator_type_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
@@ -1781,13 +1781,13 @@ public:
     );
 
   virtual CORBA_IDLType_ptr discriminator_type_def (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-
+  
     static void _get_discriminator_type_def_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
@@ -1797,13 +1797,13 @@ public:
 
   virtual void discriminator_type_def (
       CORBA_IDLType_ptr discriminator_type_def,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-
+  
     static void _set_discriminator_type_def_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
@@ -1812,13 +1812,13 @@ public:
     );
 
   virtual CORBA_UnionMemberSeq * members (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-
+  
     static void _get_members_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
@@ -1828,13 +1828,13 @@ public:
 
   virtual void members (
       const CORBA_UnionMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-
+  
     static void _set_members_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
@@ -1843,7 +1843,7 @@ public:
     );
 
   static void lookup_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -1851,7 +1851,7 @@ public:
     );
 
   static void contents_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -1859,7 +1859,7 @@ public:
     );
 
   static void lookup_name_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -1867,7 +1867,7 @@ public:
     );
 
   static void describe_contents_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -1875,7 +1875,7 @@ public:
     );
 
   static void create_module_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -1883,7 +1883,7 @@ public:
     );
 
   static void create_constant_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -1891,7 +1891,7 @@ public:
     );
 
   static void create_struct_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -1899,7 +1899,7 @@ public:
     );
 
   static void create_union_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -1907,7 +1907,7 @@ public:
     );
 
   static void create_enum_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -1915,7 +1915,7 @@ public:
     );
 
   static void create_alias_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -1923,7 +1923,7 @@ public:
     );
 
   static void create_interface_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -1931,7 +1931,7 @@ public:
     );
 
   static void create_value_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -1939,7 +1939,7 @@ public:
     );
 
   static void create_value_box_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -1947,7 +1947,7 @@ public:
     );
 
   static void create_exception_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -1955,7 +1955,7 @@ public:
     );
 
   static void create_native_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -1963,7 +1963,7 @@ public:
     );
 
   static void create_abstract_interface_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -1971,7 +1971,7 @@ public:
     );
 
   static void create_local_interface_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -1990,7 +1990,7 @@ public:
       TAO_ServerRequest &req,
       void *obj,
       void *context,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
@@ -2006,7 +2006,7 @@ public:
       TAO_ServerRequest &req,
       void *obj,
       void *context,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
@@ -2022,7 +2022,7 @@ public:
       TAO_ServerRequest &req,
       void *obj,
       void *context,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
@@ -2051,7 +2051,7 @@ public:
     );
 
   static void describe_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -2059,7 +2059,7 @@ public:
     );
 
   static void move_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -2083,7 +2083,7 @@ public:
     );
 
   static void destroy_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -2095,16 +2095,16 @@ public:
 
 
 ///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration
+//               Strategized Proxy Broker Declaration 
 //
 
-class _TAO_CORBA_UnionDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_UnionDef_Proxy_Broker
+class  _TAO_CORBA_UnionDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_UnionDef_Proxy_Broker
 {
-public:
+public: 
   _TAO_CORBA_UnionDef_Strategized_Proxy_Broker (void);
-
+  
   virtual ~_TAO_CORBA_UnionDef_Strategized_Proxy_Broker (void);
-
+  
   virtual ::_TAO_CORBA_UnionDef_Proxy_Impl &select_proxy (
     ::CORBA_UnionDef *object,
     CORBA_Environment &ACE_TRY_ENV
@@ -2118,15 +2118,15 @@ private:
     int collocation_strategy,
     CORBA::Environment &ACE_TRY_ENV
   );
-
+  
 private:
-
+  
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
   ::_TAO_CORBA_UnionDef_Proxy_Impl
   *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-
+  
   TAO_SYNCH_MUTEX mutex_;
   // This funxtion is used to get an handle to the unique instance
   // of the Strategized Proxy Broker that is available for a given
@@ -2138,7 +2138,7 @@ public:
 
 
 //
-//            End Strategized Proxy Broker Declaration
+//            End Strategized Proxy Broker Declaration 
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -2146,18 +2146,18 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl :
+class  _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl : 
   public virtual ::_TAO_CORBA_UnionDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-  public virtual ::_TAO_CORBA_TypedefDef_ThruPOA_Proxy_Impl,
+  public virtual ::_TAO_CORBA_TypedefDef_ThruPOA_Proxy_Impl, 
   public virtual ::_TAO_CORBA_Container_ThruPOA_Proxy_Impl
-
+  
 {
 public:
   _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl (void);
-
+  
   virtual ~_TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl (void) { }
-
+  
   virtual CORBA::TypeCode_ptr discriminator_type (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
@@ -2165,7 +2165,7 @@ public:
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-
+  
   virtual CORBA_IDLType_ptr discriminator_type_def (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
@@ -2173,7 +2173,7 @@ public:
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-
+  
   virtual void discriminator_type_def (
       CORBA_Object *_collocated_tao_target_,
       CORBA_IDLType_ptr discriminator_type_def,
@@ -2182,7 +2182,7 @@ public:
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-
+  
   virtual CORBA_UnionMemberSeq * members (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
@@ -2190,7 +2190,7 @@ public:
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-
+  
   virtual void members (
       CORBA_Object *_collocated_tao_target_,
       const CORBA_UnionMemberSeq & members,
@@ -2199,8 +2199,8 @@ public:
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-
-
+  
+  
 };
 
 //
@@ -2214,7 +2214,7 @@ typedef POA_CORBA_EnumDef *POA_CORBA_EnumDef_ptr;
 class _TAO_CORBA_EnumDef_ThruPOA_Proxy_Impl;
 class _TAO_CORBA_EnumDef_Strategized_Proxy_Broker;
 
-class POA_CORBA_EnumDef : public virtual POA_CORBA_TypedefDef
+class  POA_CORBA_EnumDef : public virtual POA_CORBA_TypedefDef
 {
 protected:
   POA_CORBA_EnumDef (void);
@@ -2226,7 +2226,7 @@ public:
 
   virtual CORBA::Boolean _is_a (
       const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
@@ -2262,20 +2262,20 @@ public:
     );
 
   ::CORBA_EnumDef *_this (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
   virtual const char* _interface_repository_id (void) const;
 
   virtual CORBA_EnumMemberSeq * members (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-
+  
     static void _get_members_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
@@ -2285,13 +2285,13 @@ public:
 
   virtual void members (
       const CORBA_EnumMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-
+  
     static void _set_members_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
@@ -2311,7 +2311,7 @@ public:
       TAO_ServerRequest &req,
       void *obj,
       void *context,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
@@ -2327,7 +2327,7 @@ public:
       TAO_ServerRequest &req,
       void *obj,
       void *context,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
@@ -2343,7 +2343,7 @@ public:
       TAO_ServerRequest &req,
       void *obj,
       void *context,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
@@ -2372,7 +2372,7 @@ public:
     );
 
   static void describe_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -2380,7 +2380,7 @@ public:
     );
 
   static void move_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -2404,7 +2404,7 @@ public:
     );
 
   static void destroy_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -2416,16 +2416,16 @@ public:
 
 
 ///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration
+//               Strategized Proxy Broker Declaration 
 //
 
-class _TAO_CORBA_EnumDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_EnumDef_Proxy_Broker
+class  _TAO_CORBA_EnumDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_EnumDef_Proxy_Broker
 {
-public:
+public: 
   _TAO_CORBA_EnumDef_Strategized_Proxy_Broker (void);
-
+  
   virtual ~_TAO_CORBA_EnumDef_Strategized_Proxy_Broker (void);
-
+  
   virtual ::_TAO_CORBA_EnumDef_Proxy_Impl &select_proxy (
     ::CORBA_EnumDef *object,
     CORBA_Environment &ACE_TRY_ENV
@@ -2439,15 +2439,15 @@ private:
     int collocation_strategy,
     CORBA::Environment &ACE_TRY_ENV
   );
-
+  
 private:
-
+  
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
   ::_TAO_CORBA_EnumDef_Proxy_Impl
   *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-
+  
   TAO_SYNCH_MUTEX mutex_;
   // This funxtion is used to get an handle to the unique instance
   // of the Strategized Proxy Broker that is available for a given
@@ -2459,7 +2459,7 @@ public:
 
 
 //
-//            End Strategized Proxy Broker Declaration
+//            End Strategized Proxy Broker Declaration 
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -2467,17 +2467,17 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class _TAO_CORBA_EnumDef_ThruPOA_Proxy_Impl :
+class  _TAO_CORBA_EnumDef_ThruPOA_Proxy_Impl : 
   public virtual ::_TAO_CORBA_EnumDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
   public virtual ::_TAO_CORBA_TypedefDef_ThruPOA_Proxy_Impl
-
+  
 {
 public:
   _TAO_CORBA_EnumDef_ThruPOA_Proxy_Impl (void);
-
+  
   virtual ~_TAO_CORBA_EnumDef_ThruPOA_Proxy_Impl (void) { }
-
+  
   virtual CORBA_EnumMemberSeq * members (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
@@ -2485,7 +2485,7 @@ public:
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-
+  
   virtual void members (
       CORBA_Object *_collocated_tao_target_,
       const CORBA_EnumMemberSeq & members,
@@ -2494,8 +2494,8 @@ public:
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-
-
+  
+  
 };
 
 //
@@ -2509,7 +2509,7 @@ typedef POA_CORBA_AliasDef *POA_CORBA_AliasDef_ptr;
 class _TAO_CORBA_AliasDef_ThruPOA_Proxy_Impl;
 class _TAO_CORBA_AliasDef_Strategized_Proxy_Broker;
 
-class POA_CORBA_AliasDef : public virtual POA_CORBA_TypedefDef
+class  POA_CORBA_AliasDef : public virtual POA_CORBA_TypedefDef
 {
 protected:
   POA_CORBA_AliasDef (void);
@@ -2521,7 +2521,7 @@ public:
 
   virtual CORBA::Boolean _is_a (
       const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
@@ -2557,20 +2557,20 @@ public:
     );
 
   ::CORBA_AliasDef *_this (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
   virtual const char* _interface_repository_id (void) const;
 
   virtual CORBA_IDLType_ptr original_type_def (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-
+  
     static void _get_original_type_def_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
@@ -2580,13 +2580,13 @@ public:
 
   virtual void original_type_def (
       CORBA_IDLType_ptr original_type_def,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-
+  
     static void _set_original_type_def_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
@@ -2606,7 +2606,7 @@ public:
       TAO_ServerRequest &req,
       void *obj,
       void *context,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
@@ -2622,7 +2622,7 @@ public:
       TAO_ServerRequest &req,
       void *obj,
       void *context,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
@@ -2638,7 +2638,7 @@ public:
       TAO_ServerRequest &req,
       void *obj,
       void *context,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
@@ -2667,7 +2667,7 @@ public:
     );
 
   static void describe_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -2675,7 +2675,7 @@ public:
     );
 
   static void move_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -2699,7 +2699,7 @@ public:
     );
 
   static void destroy_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -2711,16 +2711,16 @@ public:
 
 
 ///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration
+//               Strategized Proxy Broker Declaration 
 //
 
-class _TAO_CORBA_AliasDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_AliasDef_Proxy_Broker
+class  _TAO_CORBA_AliasDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_AliasDef_Proxy_Broker
 {
-public:
+public: 
   _TAO_CORBA_AliasDef_Strategized_Proxy_Broker (void);
-
+  
   virtual ~_TAO_CORBA_AliasDef_Strategized_Proxy_Broker (void);
-
+  
   virtual ::_TAO_CORBA_AliasDef_Proxy_Impl &select_proxy (
     ::CORBA_AliasDef *object,
     CORBA_Environment &ACE_TRY_ENV
@@ -2734,15 +2734,15 @@ private:
     int collocation_strategy,
     CORBA::Environment &ACE_TRY_ENV
   );
-
+  
 private:
-
+  
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
   ::_TAO_CORBA_AliasDef_Proxy_Impl
   *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-
+  
   TAO_SYNCH_MUTEX mutex_;
   // This funxtion is used to get an handle to the unique instance
   // of the Strategized Proxy Broker that is available for a given
@@ -2754,7 +2754,7 @@ public:
 
 
 //
-//            End Strategized Proxy Broker Declaration
+//            End Strategized Proxy Broker Declaration 
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -2762,17 +2762,17 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class _TAO_CORBA_AliasDef_ThruPOA_Proxy_Impl :
+class  _TAO_CORBA_AliasDef_ThruPOA_Proxy_Impl : 
   public virtual ::_TAO_CORBA_AliasDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
   public virtual ::_TAO_CORBA_TypedefDef_ThruPOA_Proxy_Impl
-
+  
 {
 public:
   _TAO_CORBA_AliasDef_ThruPOA_Proxy_Impl (void);
-
+  
   virtual ~_TAO_CORBA_AliasDef_ThruPOA_Proxy_Impl (void) { }
-
+  
   virtual CORBA_IDLType_ptr original_type_def (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
@@ -2780,7 +2780,7 @@ public:
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-
+  
   virtual void original_type_def (
       CORBA_Object *_collocated_tao_target_,
       CORBA_IDLType_ptr original_type_def,
@@ -2789,8 +2789,8 @@ public:
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-
-
+  
+  
 };
 
 //
@@ -2804,7 +2804,7 @@ typedef POA_CORBA_NativeDef *POA_CORBA_NativeDef_ptr;
 class _TAO_CORBA_NativeDef_ThruPOA_Proxy_Impl;
 class _TAO_CORBA_NativeDef_Strategized_Proxy_Broker;
 
-class POA_CORBA_NativeDef : public virtual POA_CORBA_TypedefDef
+class  POA_CORBA_NativeDef : public virtual POA_CORBA_TypedefDef
 {
 protected:
   POA_CORBA_NativeDef (void);
@@ -2816,7 +2816,7 @@ public:
 
   virtual CORBA::Boolean _is_a (
       const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
@@ -2852,7 +2852,7 @@ public:
     );
 
   ::CORBA_NativeDef *_this (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
@@ -2870,7 +2870,7 @@ public:
       TAO_ServerRequest &req,
       void *obj,
       void *context,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
@@ -2886,7 +2886,7 @@ public:
       TAO_ServerRequest &req,
       void *obj,
       void *context,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
@@ -2902,7 +2902,7 @@ public:
       TAO_ServerRequest &req,
       void *obj,
       void *context,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
@@ -2931,7 +2931,7 @@ public:
     );
 
   static void describe_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -2939,7 +2939,7 @@ public:
     );
 
   static void move_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -2963,7 +2963,7 @@ public:
     );
 
   static void destroy_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -2975,16 +2975,16 @@ public:
 
 
 ///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration
+//               Strategized Proxy Broker Declaration 
 //
 
-class _TAO_CORBA_NativeDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_NativeDef_Proxy_Broker
+class  _TAO_CORBA_NativeDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_NativeDef_Proxy_Broker
 {
-public:
+public: 
   _TAO_CORBA_NativeDef_Strategized_Proxy_Broker (void);
-
+  
   virtual ~_TAO_CORBA_NativeDef_Strategized_Proxy_Broker (void);
-
+  
   virtual ::_TAO_CORBA_NativeDef_Proxy_Impl &select_proxy (
     ::CORBA_NativeDef *object,
     CORBA_Environment &ACE_TRY_ENV
@@ -2998,15 +2998,15 @@ private:
     int collocation_strategy,
     CORBA::Environment &ACE_TRY_ENV
   );
-
+  
 private:
-
+  
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
   ::_TAO_CORBA_NativeDef_Proxy_Impl
   *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-
+  
   TAO_SYNCH_MUTEX mutex_;
   // This funxtion is used to get an handle to the unique instance
   // of the Strategized Proxy Broker that is available for a given
@@ -3018,7 +3018,7 @@ public:
 
 
 //
-//            End Strategized Proxy Broker Declaration
+//            End Strategized Proxy Broker Declaration 
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -3026,17 +3026,17 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class _TAO_CORBA_NativeDef_ThruPOA_Proxy_Impl :
+class  _TAO_CORBA_NativeDef_ThruPOA_Proxy_Impl : 
   public virtual ::_TAO_CORBA_NativeDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
   public virtual ::_TAO_CORBA_TypedefDef_ThruPOA_Proxy_Impl
-
+  
 {
 public:
   _TAO_CORBA_NativeDef_ThruPOA_Proxy_Impl (void);
-
+  
   virtual ~_TAO_CORBA_NativeDef_ThruPOA_Proxy_Impl (void) { }
-
+  
 };
 
 
@@ -3050,7 +3050,7 @@ typedef POA_CORBA_PrimitiveDef *POA_CORBA_PrimitiveDef_ptr;
 class _TAO_CORBA_PrimitiveDef_ThruPOA_Proxy_Impl;
 class _TAO_CORBA_PrimitiveDef_Strategized_Proxy_Broker;
 
-class POA_CORBA_PrimitiveDef : public virtual POA_CORBA_IDLType
+class  POA_CORBA_PrimitiveDef : public virtual POA_CORBA_IDLType
 {
 protected:
   POA_CORBA_PrimitiveDef (void);
@@ -3062,7 +3062,7 @@ public:
 
   virtual CORBA::Boolean _is_a (
       const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
@@ -3098,20 +3098,20 @@ public:
     );
 
   ::CORBA_PrimitiveDef *_this (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
   virtual const char* _interface_repository_id (void) const;
 
   virtual CORBA::PrimitiveKind kind (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-
+  
     static void _get_kind_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
@@ -3136,7 +3136,7 @@ public:
     );
 
   static void destroy_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -3148,16 +3148,16 @@ public:
 
 
 ///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration
+//               Strategized Proxy Broker Declaration 
 //
 
-class _TAO_CORBA_PrimitiveDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_PrimitiveDef_Proxy_Broker
+class  _TAO_CORBA_PrimitiveDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_PrimitiveDef_Proxy_Broker
 {
-public:
+public: 
   _TAO_CORBA_PrimitiveDef_Strategized_Proxy_Broker (void);
-
+  
   virtual ~_TAO_CORBA_PrimitiveDef_Strategized_Proxy_Broker (void);
-
+  
   virtual ::_TAO_CORBA_PrimitiveDef_Proxy_Impl &select_proxy (
     ::CORBA_PrimitiveDef *object,
     CORBA_Environment &ACE_TRY_ENV
@@ -3171,15 +3171,15 @@ private:
     int collocation_strategy,
     CORBA::Environment &ACE_TRY_ENV
   );
-
+  
 private:
-
+  
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
   ::_TAO_CORBA_PrimitiveDef_Proxy_Impl
   *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-
+  
   TAO_SYNCH_MUTEX mutex_;
   // This funxtion is used to get an handle to the unique instance
   // of the Strategized Proxy Broker that is available for a given
@@ -3191,7 +3191,7 @@ public:
 
 
 //
-//            End Strategized Proxy Broker Declaration
+//            End Strategized Proxy Broker Declaration 
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -3199,17 +3199,17 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class _TAO_CORBA_PrimitiveDef_ThruPOA_Proxy_Impl :
+class  _TAO_CORBA_PrimitiveDef_ThruPOA_Proxy_Impl : 
   public virtual ::_TAO_CORBA_PrimitiveDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
   public virtual ::_TAO_CORBA_IDLType_ThruPOA_Proxy_Impl
-
+  
 {
 public:
   _TAO_CORBA_PrimitiveDef_ThruPOA_Proxy_Impl (void);
-
+  
   virtual ~_TAO_CORBA_PrimitiveDef_ThruPOA_Proxy_Impl (void) { }
-
+  
   virtual CORBA::PrimitiveKind kind (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
@@ -3217,8 +3217,8 @@ public:
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-
-
+  
+  
 };
 
 //
@@ -3232,7 +3232,7 @@ typedef POA_CORBA_StringDef *POA_CORBA_StringDef_ptr;
 class _TAO_CORBA_StringDef_ThruPOA_Proxy_Impl;
 class _TAO_CORBA_StringDef_Strategized_Proxy_Broker;
 
-class POA_CORBA_StringDef : public virtual POA_CORBA_IDLType
+class  POA_CORBA_StringDef : public virtual POA_CORBA_IDLType
 {
 protected:
   POA_CORBA_StringDef (void);
@@ -3244,7 +3244,7 @@ public:
 
   virtual CORBA::Boolean _is_a (
       const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
@@ -3280,20 +3280,20 @@ public:
     );
 
   ::CORBA_StringDef *_this (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
   virtual const char* _interface_repository_id (void) const;
 
   virtual CORBA::ULong bound (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-
+  
     static void _get_bound_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
@@ -3303,13 +3303,13 @@ public:
 
   virtual void bound (
       CORBA::ULong bound,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-
+  
     static void _set_bound_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
@@ -3334,7 +3334,7 @@ public:
     );
 
   static void destroy_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -3346,16 +3346,16 @@ public:
 
 
 ///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration
+//               Strategized Proxy Broker Declaration 
 //
 
-class _TAO_CORBA_StringDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_StringDef_Proxy_Broker
+class  _TAO_CORBA_StringDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_StringDef_Proxy_Broker
 {
-public:
+public: 
   _TAO_CORBA_StringDef_Strategized_Proxy_Broker (void);
-
+  
   virtual ~_TAO_CORBA_StringDef_Strategized_Proxy_Broker (void);
-
+  
   virtual ::_TAO_CORBA_StringDef_Proxy_Impl &select_proxy (
     ::CORBA_StringDef *object,
     CORBA_Environment &ACE_TRY_ENV
@@ -3369,15 +3369,15 @@ private:
     int collocation_strategy,
     CORBA::Environment &ACE_TRY_ENV
   );
-
+  
 private:
-
+  
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
   ::_TAO_CORBA_StringDef_Proxy_Impl
   *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-
+  
   TAO_SYNCH_MUTEX mutex_;
   // This funxtion is used to get an handle to the unique instance
   // of the Strategized Proxy Broker that is available for a given
@@ -3389,7 +3389,7 @@ public:
 
 
 //
-//            End Strategized Proxy Broker Declaration
+//            End Strategized Proxy Broker Declaration 
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -3397,17 +3397,17 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class _TAO_CORBA_StringDef_ThruPOA_Proxy_Impl :
+class  _TAO_CORBA_StringDef_ThruPOA_Proxy_Impl : 
   public virtual ::_TAO_CORBA_StringDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
   public virtual ::_TAO_CORBA_IDLType_ThruPOA_Proxy_Impl
-
+  
 {
 public:
   _TAO_CORBA_StringDef_ThruPOA_Proxy_Impl (void);
-
+  
   virtual ~_TAO_CORBA_StringDef_ThruPOA_Proxy_Impl (void) { }
-
+  
   virtual CORBA::ULong bound (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
@@ -3415,7 +3415,7 @@ public:
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-
+  
   virtual void bound (
       CORBA_Object *_collocated_tao_target_,
       CORBA::ULong bound,
@@ -3424,8 +3424,8 @@ public:
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-
-
+  
+  
 };
 
 //
@@ -3439,7 +3439,7 @@ typedef POA_CORBA_WstringDef *POA_CORBA_WstringDef_ptr;
 class _TAO_CORBA_WstringDef_ThruPOA_Proxy_Impl;
 class _TAO_CORBA_WstringDef_Strategized_Proxy_Broker;
 
-class POA_CORBA_WstringDef : public virtual POA_CORBA_IDLType
+class  POA_CORBA_WstringDef : public virtual POA_CORBA_IDLType
 {
 protected:
   POA_CORBA_WstringDef (void);
@@ -3451,7 +3451,7 @@ public:
 
   virtual CORBA::Boolean _is_a (
       const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
@@ -3487,20 +3487,20 @@ public:
     );
 
   ::CORBA_WstringDef *_this (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
   virtual const char* _interface_repository_id (void) const;
 
   virtual CORBA::ULong bound (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-
+  
     static void _get_bound_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
@@ -3510,13 +3510,13 @@ public:
 
   virtual void bound (
       CORBA::ULong bound,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-
+  
     static void _set_bound_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
@@ -3541,7 +3541,7 @@ public:
     );
 
   static void destroy_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -3553,16 +3553,16 @@ public:
 
 
 ///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration
+//               Strategized Proxy Broker Declaration 
 //
 
-class _TAO_CORBA_WstringDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_WstringDef_Proxy_Broker
+class  _TAO_CORBA_WstringDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_WstringDef_Proxy_Broker
 {
-public:
+public: 
   _TAO_CORBA_WstringDef_Strategized_Proxy_Broker (void);
-
+  
   virtual ~_TAO_CORBA_WstringDef_Strategized_Proxy_Broker (void);
-
+  
   virtual ::_TAO_CORBA_WstringDef_Proxy_Impl &select_proxy (
     ::CORBA_WstringDef *object,
     CORBA_Environment &ACE_TRY_ENV
@@ -3576,15 +3576,15 @@ private:
     int collocation_strategy,
     CORBA::Environment &ACE_TRY_ENV
   );
-
+  
 private:
-
+  
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
   ::_TAO_CORBA_WstringDef_Proxy_Impl
   *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-
+  
   TAO_SYNCH_MUTEX mutex_;
   // This funxtion is used to get an handle to the unique instance
   // of the Strategized Proxy Broker that is available for a given
@@ -3596,7 +3596,7 @@ public:
 
 
 //
-//            End Strategized Proxy Broker Declaration
+//            End Strategized Proxy Broker Declaration 
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -3604,17 +3604,17 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class _TAO_CORBA_WstringDef_ThruPOA_Proxy_Impl :
+class  _TAO_CORBA_WstringDef_ThruPOA_Proxy_Impl : 
   public virtual ::_TAO_CORBA_WstringDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
   public virtual ::_TAO_CORBA_IDLType_ThruPOA_Proxy_Impl
-
+  
 {
 public:
   _TAO_CORBA_WstringDef_ThruPOA_Proxy_Impl (void);
-
+  
   virtual ~_TAO_CORBA_WstringDef_ThruPOA_Proxy_Impl (void) { }
-
+  
   virtual CORBA::ULong bound (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
@@ -3622,7 +3622,7 @@ public:
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-
+  
   virtual void bound (
       CORBA_Object *_collocated_tao_target_,
       CORBA::ULong bound,
@@ -3631,8 +3631,8 @@ public:
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-
-
+  
+  
 };
 
 //
@@ -3646,7 +3646,7 @@ typedef POA_CORBA_SequenceDef *POA_CORBA_SequenceDef_ptr;
 class _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl;
 class _TAO_CORBA_SequenceDef_Strategized_Proxy_Broker;
 
-class POA_CORBA_SequenceDef : public virtual POA_CORBA_IDLType
+class  POA_CORBA_SequenceDef : public virtual POA_CORBA_IDLType
 {
 protected:
   POA_CORBA_SequenceDef (void);
@@ -3658,7 +3658,7 @@ public:
 
   virtual CORBA::Boolean _is_a (
       const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
@@ -3694,20 +3694,20 @@ public:
     );
 
   ::CORBA_SequenceDef *_this (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
   virtual const char* _interface_repository_id (void) const;
 
   virtual CORBA::ULong bound (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-
+  
     static void _get_bound_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
@@ -3717,13 +3717,13 @@ public:
 
   virtual void bound (
       CORBA::ULong bound,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-
+  
     static void _set_bound_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
@@ -3732,13 +3732,13 @@ public:
     );
 
   virtual CORBA::TypeCode_ptr element_type (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-
+  
     static void _get_element_type_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
@@ -3747,13 +3747,13 @@ public:
     );
 
   virtual CORBA_IDLType_ptr element_type_def (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-
+  
     static void _get_element_type_def_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
@@ -3763,13 +3763,13 @@ public:
 
   virtual void element_type_def (
       CORBA_IDLType_ptr element_type_def,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-
+  
     static void _set_element_type_def_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
@@ -3794,7 +3794,7 @@ public:
     );
 
   static void destroy_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -3806,16 +3806,16 @@ public:
 
 
 ///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration
+//               Strategized Proxy Broker Declaration 
 //
 
-class _TAO_CORBA_SequenceDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_SequenceDef_Proxy_Broker
+class  _TAO_CORBA_SequenceDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_SequenceDef_Proxy_Broker
 {
-public:
+public: 
   _TAO_CORBA_SequenceDef_Strategized_Proxy_Broker (void);
-
+  
   virtual ~_TAO_CORBA_SequenceDef_Strategized_Proxy_Broker (void);
-
+  
   virtual ::_TAO_CORBA_SequenceDef_Proxy_Impl &select_proxy (
     ::CORBA_SequenceDef *object,
     CORBA_Environment &ACE_TRY_ENV
@@ -3829,15 +3829,15 @@ private:
     int collocation_strategy,
     CORBA::Environment &ACE_TRY_ENV
   );
-
+  
 private:
-
+  
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
   ::_TAO_CORBA_SequenceDef_Proxy_Impl
   *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-
+  
   TAO_SYNCH_MUTEX mutex_;
   // This funxtion is used to get an handle to the unique instance
   // of the Strategized Proxy Broker that is available for a given
@@ -3849,7 +3849,7 @@ public:
 
 
 //
-//            End Strategized Proxy Broker Declaration
+//            End Strategized Proxy Broker Declaration 
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -3857,17 +3857,17 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl :
+class  _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl : 
   public virtual ::_TAO_CORBA_SequenceDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
   public virtual ::_TAO_CORBA_IDLType_ThruPOA_Proxy_Impl
-
+  
 {
 public:
   _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl (void);
-
+  
   virtual ~_TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl (void) { }
-
+  
   virtual CORBA::ULong bound (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
@@ -3875,7 +3875,7 @@ public:
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-
+  
   virtual void bound (
       CORBA_Object *_collocated_tao_target_,
       CORBA::ULong bound,
@@ -3884,7 +3884,7 @@ public:
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-
+  
   virtual CORBA::TypeCode_ptr element_type (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
@@ -3892,7 +3892,7 @@ public:
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-
+  
   virtual CORBA_IDLType_ptr element_type_def (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
@@ -3900,7 +3900,7 @@ public:
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-
+  
   virtual void element_type_def (
       CORBA_Object *_collocated_tao_target_,
       CORBA_IDLType_ptr element_type_def,
@@ -3909,8 +3909,8 @@ public:
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-
-
+  
+  
 };
 
 //
@@ -3924,7 +3924,7 @@ typedef POA_CORBA_ArrayDef *POA_CORBA_ArrayDef_ptr;
 class _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl;
 class _TAO_CORBA_ArrayDef_Strategized_Proxy_Broker;
 
-class POA_CORBA_ArrayDef : public virtual POA_CORBA_IDLType
+class  POA_CORBA_ArrayDef : public virtual POA_CORBA_IDLType
 {
 protected:
   POA_CORBA_ArrayDef (void);
@@ -3936,7 +3936,7 @@ public:
 
   virtual CORBA::Boolean _is_a (
       const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
@@ -3972,20 +3972,20 @@ public:
     );
 
   ::CORBA_ArrayDef *_this (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
   virtual const char* _interface_repository_id (void) const;
 
   virtual CORBA::ULong length (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-
+  
     static void _get_length_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
@@ -3995,13 +3995,13 @@ public:
 
   virtual void length (
       CORBA::ULong length,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-
+  
     static void _set_length_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
@@ -4010,13 +4010,13 @@ public:
     );
 
   virtual CORBA::TypeCode_ptr element_type (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-
+  
     static void _get_element_type_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
@@ -4025,13 +4025,13 @@ public:
     );
 
   virtual CORBA_IDLType_ptr element_type_def (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-
+  
     static void _get_element_type_def_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
@@ -4041,13 +4041,13 @@ public:
 
   virtual void element_type_def (
       CORBA_IDLType_ptr element_type_def,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-
+  
     static void _set_element_type_def_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
@@ -4072,7 +4072,7 @@ public:
     );
 
   static void destroy_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -4084,16 +4084,16 @@ public:
 
 
 ///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration
+//               Strategized Proxy Broker Declaration 
 //
 
-class _TAO_CORBA_ArrayDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_ArrayDef_Proxy_Broker
+class  _TAO_CORBA_ArrayDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_ArrayDef_Proxy_Broker
 {
-public:
+public: 
   _TAO_CORBA_ArrayDef_Strategized_Proxy_Broker (void);
-
+  
   virtual ~_TAO_CORBA_ArrayDef_Strategized_Proxy_Broker (void);
-
+  
   virtual ::_TAO_CORBA_ArrayDef_Proxy_Impl &select_proxy (
     ::CORBA_ArrayDef *object,
     CORBA_Environment &ACE_TRY_ENV
@@ -4107,15 +4107,15 @@ private:
     int collocation_strategy,
     CORBA::Environment &ACE_TRY_ENV
   );
-
+  
 private:
-
+  
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
   ::_TAO_CORBA_ArrayDef_Proxy_Impl
   *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-
+  
   TAO_SYNCH_MUTEX mutex_;
   // This funxtion is used to get an handle to the unique instance
   // of the Strategized Proxy Broker that is available for a given
@@ -4127,7 +4127,7 @@ public:
 
 
 //
-//            End Strategized Proxy Broker Declaration
+//            End Strategized Proxy Broker Declaration 
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -4135,17 +4135,17 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl :
+class  _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl : 
   public virtual ::_TAO_CORBA_ArrayDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
   public virtual ::_TAO_CORBA_IDLType_ThruPOA_Proxy_Impl
-
+  
 {
 public:
   _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl (void);
-
+  
   virtual ~_TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl (void) { }
-
+  
   virtual CORBA::ULong length (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
@@ -4153,7 +4153,7 @@ public:
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-
+  
   virtual void length (
       CORBA_Object *_collocated_tao_target_,
       CORBA::ULong length,
@@ -4162,7 +4162,7 @@ public:
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-
+  
   virtual CORBA::TypeCode_ptr element_type (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
@@ -4170,7 +4170,7 @@ public:
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-
+  
   virtual CORBA_IDLType_ptr element_type_def (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
@@ -4178,7 +4178,7 @@ public:
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-
+  
   virtual void element_type_def (
       CORBA_Object *_collocated_tao_target_,
       CORBA_IDLType_ptr element_type_def,
@@ -4187,8 +4187,8 @@ public:
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-
-
+  
+  
 };
 
 //
@@ -4202,7 +4202,7 @@ typedef POA_CORBA_ExceptionDef *POA_CORBA_ExceptionDef_ptr;
 class _TAO_CORBA_ExceptionDef_ThruPOA_Proxy_Impl;
 class _TAO_CORBA_ExceptionDef_Strategized_Proxy_Broker;
 
-class POA_CORBA_ExceptionDef : public virtual POA_CORBA_Contained, public virtual POA_CORBA_Container
+class  POA_CORBA_ExceptionDef : public virtual POA_CORBA_Contained, public virtual POA_CORBA_Container
 {
 protected:
   POA_CORBA_ExceptionDef (void);
@@ -4214,7 +4214,7 @@ public:
 
   virtual CORBA::Boolean _is_a (
       const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
@@ -4250,20 +4250,20 @@ public:
     );
 
   ::CORBA_ExceptionDef *_this (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
   virtual const char* _interface_repository_id (void) const;
 
   virtual CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-
+  
     static void _get_type_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
@@ -4272,13 +4272,13 @@ public:
     );
 
   virtual CORBA_StructMemberSeq * members (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-
+  
     static void _get_members_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
@@ -4288,13 +4288,13 @@ public:
 
   virtual void members (
       const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-
+  
     static void _set_members_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
@@ -4314,7 +4314,7 @@ public:
       TAO_ServerRequest &req,
       void *obj,
       void *context,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
@@ -4330,7 +4330,7 @@ public:
       TAO_ServerRequest &req,
       void *obj,
       void *context,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
@@ -4346,7 +4346,7 @@ public:
       TAO_ServerRequest &req,
       void *obj,
       void *context,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
@@ -4375,7 +4375,7 @@ public:
     );
 
   static void describe_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -4383,7 +4383,7 @@ public:
     );
 
   static void move_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -4391,7 +4391,7 @@ public:
     );
 
   static void lookup_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -4399,7 +4399,7 @@ public:
     );
 
   static void contents_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -4407,7 +4407,7 @@ public:
     );
 
   static void lookup_name_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -4415,7 +4415,7 @@ public:
     );
 
   static void describe_contents_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -4423,7 +4423,7 @@ public:
     );
 
   static void create_module_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -4431,7 +4431,7 @@ public:
     );
 
   static void create_constant_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -4439,7 +4439,7 @@ public:
     );
 
   static void create_struct_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -4447,7 +4447,7 @@ public:
     );
 
   static void create_union_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -4455,7 +4455,7 @@ public:
     );
 
   static void create_enum_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -4463,7 +4463,7 @@ public:
     );
 
   static void create_alias_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -4471,7 +4471,7 @@ public:
     );
 
   static void create_interface_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -4479,7 +4479,7 @@ public:
     );
 
   static void create_value_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -4487,7 +4487,7 @@ public:
     );
 
   static void create_value_box_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -4495,7 +4495,7 @@ public:
     );
 
   static void create_exception_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -4503,7 +4503,7 @@ public:
     );
 
   static void create_native_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -4511,7 +4511,7 @@ public:
     );
 
   static void create_abstract_interface_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -4519,7 +4519,7 @@ public:
     );
 
   static void create_local_interface_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -4535,7 +4535,7 @@ public:
     );
 
   static void destroy_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -4547,16 +4547,16 @@ public:
 
 
 ///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration
+//               Strategized Proxy Broker Declaration 
 //
 
-class _TAO_CORBA_ExceptionDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_ExceptionDef_Proxy_Broker
+class  _TAO_CORBA_ExceptionDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_ExceptionDef_Proxy_Broker
 {
-public:
+public: 
   _TAO_CORBA_ExceptionDef_Strategized_Proxy_Broker (void);
-
+  
   virtual ~_TAO_CORBA_ExceptionDef_Strategized_Proxy_Broker (void);
-
+  
   virtual ::_TAO_CORBA_ExceptionDef_Proxy_Impl &select_proxy (
     ::CORBA_ExceptionDef *object,
     CORBA_Environment &ACE_TRY_ENV
@@ -4570,15 +4570,15 @@ private:
     int collocation_strategy,
     CORBA::Environment &ACE_TRY_ENV
   );
-
+  
 private:
-
+  
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
   ::_TAO_CORBA_ExceptionDef_Proxy_Impl
   *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-
+  
   TAO_SYNCH_MUTEX mutex_;
   // This funxtion is used to get an handle to the unique instance
   // of the Strategized Proxy Broker that is available for a given
@@ -4590,7 +4590,7 @@ public:
 
 
 //
-//            End Strategized Proxy Broker Declaration
+//            End Strategized Proxy Broker Declaration 
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -4598,18 +4598,18 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class _TAO_CORBA_ExceptionDef_ThruPOA_Proxy_Impl :
+class  _TAO_CORBA_ExceptionDef_ThruPOA_Proxy_Impl : 
   public virtual ::_TAO_CORBA_ExceptionDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-  public virtual ::_TAO_CORBA_Contained_ThruPOA_Proxy_Impl,
+  public virtual ::_TAO_CORBA_Contained_ThruPOA_Proxy_Impl, 
   public virtual ::_TAO_CORBA_Container_ThruPOA_Proxy_Impl
-
+  
 {
 public:
   _TAO_CORBA_ExceptionDef_ThruPOA_Proxy_Impl (void);
-
+  
   virtual ~_TAO_CORBA_ExceptionDef_ThruPOA_Proxy_Impl (void) { }
-
+  
   virtual CORBA::TypeCode_ptr type (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
@@ -4617,7 +4617,7 @@ public:
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-
+  
   virtual CORBA_StructMemberSeq * members (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
@@ -4625,7 +4625,7 @@ public:
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-
+  
   virtual void members (
       CORBA_Object *_collocated_tao_target_,
       const CORBA_StructMemberSeq & members,
@@ -4634,8 +4634,8 @@ public:
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-
-
+  
+  
 };
 
 //
@@ -4649,7 +4649,7 @@ typedef POA_CORBA_AttributeDef *POA_CORBA_AttributeDef_ptr;
 class _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl;
 class _TAO_CORBA_AttributeDef_Strategized_Proxy_Broker;
 
-class POA_CORBA_AttributeDef : public virtual POA_CORBA_Contained
+class  POA_CORBA_AttributeDef : public virtual POA_CORBA_Contained
 {
 protected:
   POA_CORBA_AttributeDef (void);
@@ -4661,7 +4661,7 @@ public:
 
   virtual CORBA::Boolean _is_a (
       const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
@@ -4697,20 +4697,20 @@ public:
     );
 
   ::CORBA_AttributeDef *_this (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
   virtual const char* _interface_repository_id (void) const;
 
   virtual CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-
+  
     static void _get_type_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
@@ -4719,13 +4719,13 @@ public:
     );
 
   virtual CORBA_IDLType_ptr type_def (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-
+  
     static void _get_type_def_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
@@ -4735,13 +4735,13 @@ public:
 
   virtual void type_def (
       CORBA_IDLType_ptr type_def,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-
+  
     static void _set_type_def_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
@@ -4750,13 +4750,13 @@ public:
     );
 
   virtual CORBA::AttributeMode mode (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-
+  
     static void _get_mode_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
@@ -4766,13 +4766,13 @@ public:
 
   virtual void mode (
       CORBA::AttributeMode mode,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-
+  
     static void _set_mode_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
@@ -4792,7 +4792,7 @@ public:
       TAO_ServerRequest &req,
       void *obj,
       void *context,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
@@ -4808,7 +4808,7 @@ public:
       TAO_ServerRequest &req,
       void *obj,
       void *context,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
@@ -4824,7 +4824,7 @@ public:
       TAO_ServerRequest &req,
       void *obj,
       void *context,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
@@ -4853,7 +4853,7 @@ public:
     );
 
   static void describe_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -4861,7 +4861,7 @@ public:
     );
 
   static void move_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -4877,7 +4877,7 @@ public:
     );
 
   static void destroy_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -4889,16 +4889,16 @@ public:
 
 
 ///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration
+//               Strategized Proxy Broker Declaration 
 //
 
-class _TAO_CORBA_AttributeDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_AttributeDef_Proxy_Broker
+class  _TAO_CORBA_AttributeDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_AttributeDef_Proxy_Broker
 {
-public:
+public: 
   _TAO_CORBA_AttributeDef_Strategized_Proxy_Broker (void);
-
+  
   virtual ~_TAO_CORBA_AttributeDef_Strategized_Proxy_Broker (void);
-
+  
   virtual ::_TAO_CORBA_AttributeDef_Proxy_Impl &select_proxy (
     ::CORBA_AttributeDef *object,
     CORBA_Environment &ACE_TRY_ENV
@@ -4912,15 +4912,15 @@ private:
     int collocation_strategy,
     CORBA::Environment &ACE_TRY_ENV
   );
-
+  
 private:
-
+  
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
   ::_TAO_CORBA_AttributeDef_Proxy_Impl
   *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-
+  
   TAO_SYNCH_MUTEX mutex_;
   // This funxtion is used to get an handle to the unique instance
   // of the Strategized Proxy Broker that is available for a given
@@ -4932,7 +4932,7 @@ public:
 
 
 //
-//            End Strategized Proxy Broker Declaration
+//            End Strategized Proxy Broker Declaration 
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -4940,17 +4940,17 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl :
+class  _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl : 
   public virtual ::_TAO_CORBA_AttributeDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
   public virtual ::_TAO_CORBA_Contained_ThruPOA_Proxy_Impl
-
+  
 {
 public:
   _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl (void);
-
+  
   virtual ~_TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl (void) { }
-
+  
   virtual CORBA::TypeCode_ptr type (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
@@ -4958,7 +4958,7 @@ public:
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-
+  
   virtual CORBA_IDLType_ptr type_def (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
@@ -4966,7 +4966,7 @@ public:
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-
+  
   virtual void type_def (
       CORBA_Object *_collocated_tao_target_,
       CORBA_IDLType_ptr type_def,
@@ -4975,7 +4975,7 @@ public:
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-
+  
   virtual CORBA::AttributeMode mode (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
@@ -4983,7 +4983,7 @@ public:
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-
+  
   virtual void mode (
       CORBA_Object *_collocated_tao_target_,
       CORBA::AttributeMode mode,
@@ -4992,8 +4992,8 @@ public:
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-
-
+  
+  
 };
 
 //
@@ -5007,7 +5007,7 @@ typedef POA_CORBA_OperationDef *POA_CORBA_OperationDef_ptr;
 class _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl;
 class _TAO_CORBA_OperationDef_Strategized_Proxy_Broker;
 
-class POA_CORBA_OperationDef : public virtual POA_CORBA_Contained
+class  POA_CORBA_OperationDef : public virtual POA_CORBA_Contained
 {
 protected:
   POA_CORBA_OperationDef (void);
@@ -5019,7 +5019,7 @@ public:
 
   virtual CORBA::Boolean _is_a (
       const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
@@ -5055,20 +5055,20 @@ public:
     );
 
   ::CORBA_OperationDef *_this (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
   virtual const char* _interface_repository_id (void) const;
 
   virtual CORBA::TypeCode_ptr result (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-
+  
     static void _get_result_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
@@ -5077,13 +5077,13 @@ public:
     );
 
   virtual CORBA_IDLType_ptr result_def (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-
+  
     static void _get_result_def_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
@@ -5093,13 +5093,13 @@ public:
 
   virtual void result_def (
       CORBA_IDLType_ptr result_def,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-
+  
     static void _set_result_def_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
@@ -5108,13 +5108,13 @@ public:
     );
 
   virtual CORBA_ParDescriptionSeq * params (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-
+  
     static void _get_params_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
@@ -5124,13 +5124,13 @@ public:
 
   virtual void params (
       const CORBA_ParDescriptionSeq & params,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-
+  
     static void _set_params_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
@@ -5139,13 +5139,13 @@ public:
     );
 
   virtual CORBA::OperationMode mode (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-
+  
     static void _get_mode_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
@@ -5155,13 +5155,13 @@ public:
 
   virtual void mode (
       CORBA::OperationMode mode,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-
+  
     static void _set_mode_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
@@ -5170,13 +5170,13 @@ public:
     );
 
   virtual CORBA_ContextIdSeq * contexts (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-
+  
     static void _get_contexts_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
@@ -5186,13 +5186,13 @@ public:
 
   virtual void contexts (
       const CORBA_ContextIdSeq & contexts,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-
+  
     static void _set_contexts_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
@@ -5201,13 +5201,13 @@ public:
     );
 
   virtual CORBA_ExceptionDefSeq * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-
+  
     static void _get_exceptions_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
@@ -5217,13 +5217,13 @@ public:
 
   virtual void exceptions (
       const CORBA_ExceptionDefSeq & exceptions,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-
+  
     static void _set_exceptions_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
@@ -5243,7 +5243,7 @@ public:
       TAO_ServerRequest &req,
       void *obj,
       void *context,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
@@ -5259,7 +5259,7 @@ public:
       TAO_ServerRequest &req,
       void *obj,
       void *context,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
@@ -5275,7 +5275,7 @@ public:
       TAO_ServerRequest &req,
       void *obj,
       void *context,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
@@ -5304,7 +5304,7 @@ public:
     );
 
   static void describe_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -5312,7 +5312,7 @@ public:
     );
 
   static void move_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -5328,7 +5328,7 @@ public:
     );
 
   static void destroy_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -5340,16 +5340,16 @@ public:
 
 
 ///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration
+//               Strategized Proxy Broker Declaration 
 //
 
-class _TAO_CORBA_OperationDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_OperationDef_Proxy_Broker
+class  _TAO_CORBA_OperationDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_OperationDef_Proxy_Broker
 {
-public:
+public: 
   _TAO_CORBA_OperationDef_Strategized_Proxy_Broker (void);
-
+  
   virtual ~_TAO_CORBA_OperationDef_Strategized_Proxy_Broker (void);
-
+  
   virtual ::_TAO_CORBA_OperationDef_Proxy_Impl &select_proxy (
     ::CORBA_OperationDef *object,
     CORBA_Environment &ACE_TRY_ENV
@@ -5363,15 +5363,15 @@ private:
     int collocation_strategy,
     CORBA::Environment &ACE_TRY_ENV
   );
-
+  
 private:
-
+  
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
   ::_TAO_CORBA_OperationDef_Proxy_Impl
   *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-
+  
   TAO_SYNCH_MUTEX mutex_;
   // This funxtion is used to get an handle to the unique instance
   // of the Strategized Proxy Broker that is available for a given
@@ -5383,7 +5383,7 @@ public:
 
 
 //
-//            End Strategized Proxy Broker Declaration
+//            End Strategized Proxy Broker Declaration 
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -5391,17 +5391,17 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl :
+class  _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl : 
   public virtual ::_TAO_CORBA_OperationDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
   public virtual ::_TAO_CORBA_Contained_ThruPOA_Proxy_Impl
-
+  
 {
 public:
   _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl (void);
-
+  
   virtual ~_TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl (void) { }
-
+  
   virtual CORBA::TypeCode_ptr result (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
@@ -5409,7 +5409,7 @@ public:
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-
+  
   virtual CORBA_IDLType_ptr result_def (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
@@ -5417,7 +5417,7 @@ public:
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-
+  
   virtual void result_def (
       CORBA_Object *_collocated_tao_target_,
       CORBA_IDLType_ptr result_def,
@@ -5426,7 +5426,7 @@ public:
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-
+  
   virtual CORBA_ParDescriptionSeq * params (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
@@ -5434,7 +5434,7 @@ public:
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-
+  
   virtual void params (
       CORBA_Object *_collocated_tao_target_,
       const CORBA_ParDescriptionSeq & params,
@@ -5443,7 +5443,7 @@ public:
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-
+  
   virtual CORBA::OperationMode mode (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
@@ -5451,7 +5451,7 @@ public:
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-
+  
   virtual void mode (
       CORBA_Object *_collocated_tao_target_,
       CORBA::OperationMode mode,
@@ -5460,7 +5460,7 @@ public:
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-
+  
   virtual CORBA_ContextIdSeq * contexts (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
@@ -5468,7 +5468,7 @@ public:
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-
+  
   virtual void contexts (
       CORBA_Object *_collocated_tao_target_,
       const CORBA_ContextIdSeq & contexts,
@@ -5477,7 +5477,7 @@ public:
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-
+  
   virtual CORBA_ExceptionDefSeq * exceptions (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
@@ -5485,7 +5485,7 @@ public:
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-
+  
   virtual void exceptions (
       CORBA_Object *_collocated_tao_target_,
       const CORBA_ExceptionDefSeq & exceptions,
@@ -5494,8 +5494,8 @@ public:
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-
-
+  
+  
 };
 
 //
@@ -5509,7 +5509,7 @@ typedef POA_CORBA_InterfaceDef *POA_CORBA_InterfaceDef_ptr;
 class _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl;
 class _TAO_CORBA_InterfaceDef_Strategized_Proxy_Broker;
 
-class POA_CORBA_InterfaceDef : public virtual POA_CORBA_Container, public virtual POA_CORBA_Contained, public virtual POA_CORBA_IDLType
+class  POA_CORBA_InterfaceDef : public virtual POA_CORBA_Container, public virtual POA_CORBA_Contained, public virtual POA_CORBA_IDLType
 {
 protected:
   POA_CORBA_InterfaceDef (void);
@@ -5521,7 +5521,7 @@ public:
 
   virtual CORBA::Boolean _is_a (
       const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
@@ -5557,20 +5557,20 @@ public:
     );
 
   ::CORBA_InterfaceDef *_this (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
   virtual const char* _interface_repository_id (void) const;
 
   virtual CORBA_InterfaceDefSeq * base_interfaces (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-
+  
     static void _get_base_interfaces_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
@@ -5580,13 +5580,13 @@ public:
 
   virtual void base_interfaces (
       const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-
+  
     static void _set_base_interfaces_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
@@ -5596,13 +5596,13 @@ public:
 
   virtual CORBA::Boolean is_a (
       const char * interface_id,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-
+  
     static void is_a_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
@@ -5611,13 +5611,13 @@ public:
     );
 
   virtual CORBA_InterfaceDef::FullInterfaceDescription * describe_interface (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-
+  
     static void describe_interface_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
@@ -5631,13 +5631,13 @@ public:
       const char * version,
       CORBA_IDLType_ptr type,
       CORBA::AttributeMode mode,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-
+  
     static void create_attribute_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
@@ -5654,13 +5654,13 @@ public:
       const CORBA_ParDescriptionSeq & params,
       const CORBA_ExceptionDefSeq & exceptions,
       const CORBA_ContextIdSeq & contexts,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-
+  
     static void create_operation_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
@@ -5669,7 +5669,7 @@ public:
     );
 
   static void lookup_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -5677,7 +5677,7 @@ public:
     );
 
   static void contents_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -5685,7 +5685,7 @@ public:
     );
 
   static void lookup_name_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -5693,7 +5693,7 @@ public:
     );
 
   static void describe_contents_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -5701,7 +5701,7 @@ public:
     );
 
   static void create_module_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -5709,7 +5709,7 @@ public:
     );
 
   static void create_constant_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -5717,7 +5717,7 @@ public:
     );
 
   static void create_struct_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -5725,7 +5725,7 @@ public:
     );
 
   static void create_union_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -5733,7 +5733,7 @@ public:
     );
 
   static void create_enum_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -5741,7 +5741,7 @@ public:
     );
 
   static void create_alias_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -5749,7 +5749,7 @@ public:
     );
 
   static void create_interface_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -5757,7 +5757,7 @@ public:
     );
 
   static void create_value_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -5765,7 +5765,7 @@ public:
     );
 
   static void create_value_box_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -5773,7 +5773,7 @@ public:
     );
 
   static void create_exception_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -5781,7 +5781,7 @@ public:
     );
 
   static void create_native_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -5789,7 +5789,7 @@ public:
     );
 
   static void create_abstract_interface_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -5797,7 +5797,7 @@ public:
     );
 
   static void create_local_interface_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -5816,7 +5816,7 @@ public:
       TAO_ServerRequest &req,
       void *obj,
       void *context,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
@@ -5832,7 +5832,7 @@ public:
       TAO_ServerRequest &req,
       void *obj,
       void *context,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
@@ -5848,7 +5848,7 @@ public:
       TAO_ServerRequest &req,
       void *obj,
       void *context,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
@@ -5877,7 +5877,7 @@ public:
     );
 
   static void describe_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -5885,7 +5885,7 @@ public:
     );
 
   static void move_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -5909,7 +5909,7 @@ public:
     );
 
   static void destroy_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -5921,16 +5921,16 @@ public:
 
 
 ///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration
+//               Strategized Proxy Broker Declaration 
 //
 
-class _TAO_CORBA_InterfaceDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_InterfaceDef_Proxy_Broker
+class  _TAO_CORBA_InterfaceDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_InterfaceDef_Proxy_Broker
 {
-public:
+public: 
   _TAO_CORBA_InterfaceDef_Strategized_Proxy_Broker (void);
-
+  
   virtual ~_TAO_CORBA_InterfaceDef_Strategized_Proxy_Broker (void);
-
+  
   virtual ::_TAO_CORBA_InterfaceDef_Proxy_Impl &select_proxy (
     ::CORBA_InterfaceDef *object,
     CORBA_Environment &ACE_TRY_ENV
@@ -5944,15 +5944,15 @@ private:
     int collocation_strategy,
     CORBA::Environment &ACE_TRY_ENV
   );
-
+  
 private:
-
+  
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
   ::_TAO_CORBA_InterfaceDef_Proxy_Impl
   *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-
+  
   TAO_SYNCH_MUTEX mutex_;
   // This funxtion is used to get an handle to the unique instance
   // of the Strategized Proxy Broker that is available for a given
@@ -5964,7 +5964,7 @@ public:
 
 
 //
-//            End Strategized Proxy Broker Declaration
+//            End Strategized Proxy Broker Declaration 
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -5972,19 +5972,19 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl :
+class  _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl : 
   public virtual ::_TAO_CORBA_InterfaceDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-  public virtual ::_TAO_CORBA_Container_ThruPOA_Proxy_Impl,
-  public virtual ::_TAO_CORBA_Contained_ThruPOA_Proxy_Impl,
+  public virtual ::_TAO_CORBA_Container_ThruPOA_Proxy_Impl, 
+  public virtual ::_TAO_CORBA_Contained_ThruPOA_Proxy_Impl, 
   public virtual ::_TAO_CORBA_IDLType_ThruPOA_Proxy_Impl
-
+  
 {
 public:
   _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl (void);
-
+  
   virtual ~_TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl (void) { }
-
+  
   virtual CORBA_InterfaceDefSeq * base_interfaces (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
@@ -5992,7 +5992,7 @@ public:
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-
+  
   virtual void base_interfaces (
       CORBA_Object *_collocated_tao_target_,
       const CORBA_InterfaceDefSeq & base_interfaces,
@@ -6001,7 +6001,7 @@ public:
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-
+  
   virtual CORBA::Boolean is_a (
       CORBA_Object *_collocated_tao_target_,
       const char * interface_id,
@@ -6010,7 +6010,7 @@ public:
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-
+  
   virtual CORBA_InterfaceDef::FullInterfaceDescription * describe_interface (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
@@ -6018,7 +6018,7 @@ public:
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-
+  
   virtual CORBA_AttributeDef_ptr create_attribute (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
@@ -6031,7 +6031,7 @@ public:
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-
+  
   virtual CORBA_OperationDef_ptr create_operation (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
@@ -6047,8 +6047,8 @@ public:
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-
-
+  
+  
 };
 
 //
@@ -6062,7 +6062,7 @@ typedef POA_CORBA_AbstractInterfaceDef *POA_CORBA_AbstractInterfaceDef_ptr;
 class _TAO_CORBA_AbstractInterfaceDef_ThruPOA_Proxy_Impl;
 class _TAO_CORBA_AbstractInterfaceDef_Strategized_Proxy_Broker;
 
-class POA_CORBA_AbstractInterfaceDef : public virtual POA_CORBA_InterfaceDef
+class  POA_CORBA_AbstractInterfaceDef : public virtual POA_CORBA_InterfaceDef
 {
 protected:
   POA_CORBA_AbstractInterfaceDef (void);
@@ -6074,7 +6074,7 @@ public:
 
   virtual CORBA::Boolean _is_a (
       const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
@@ -6110,7 +6110,7 @@ public:
     );
 
   ::CORBA_AbstractInterfaceDef *_this (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
@@ -6128,12 +6128,12 @@ public:
       TAO_ServerRequest &req,
       void *obj,
       void *context,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
   static void is_a_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -6141,7 +6141,7 @@ public:
     );
 
   static void describe_interface_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -6149,7 +6149,7 @@ public:
     );
 
   static void create_attribute_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -6157,7 +6157,7 @@ public:
     );
 
   static void create_operation_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -6165,7 +6165,7 @@ public:
     );
 
   static void lookup_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -6173,7 +6173,7 @@ public:
     );
 
   static void contents_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -6181,7 +6181,7 @@ public:
     );
 
   static void lookup_name_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -6189,7 +6189,7 @@ public:
     );
 
   static void describe_contents_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -6197,7 +6197,7 @@ public:
     );
 
   static void create_module_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -6205,7 +6205,7 @@ public:
     );
 
   static void create_constant_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -6213,7 +6213,7 @@ public:
     );
 
   static void create_struct_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -6221,7 +6221,7 @@ public:
     );
 
   static void create_union_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -6229,7 +6229,7 @@ public:
     );
 
   static void create_enum_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -6237,7 +6237,7 @@ public:
     );
 
   static void create_alias_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -6245,7 +6245,7 @@ public:
     );
 
   static void create_interface_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -6253,7 +6253,7 @@ public:
     );
 
   static void create_value_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -6261,7 +6261,7 @@ public:
     );
 
   static void create_value_box_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -6269,7 +6269,7 @@ public:
     );
 
   static void create_exception_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -6277,7 +6277,7 @@ public:
     );
 
   static void create_native_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -6285,7 +6285,7 @@ public:
     );
 
   static void create_abstract_interface_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -6293,7 +6293,7 @@ public:
     );
 
   static void create_local_interface_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -6312,7 +6312,7 @@ public:
       TAO_ServerRequest &req,
       void *obj,
       void *context,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
@@ -6328,7 +6328,7 @@ public:
       TAO_ServerRequest &req,
       void *obj,
       void *context,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
@@ -6344,7 +6344,7 @@ public:
       TAO_ServerRequest &req,
       void *obj,
       void *context,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
@@ -6373,7 +6373,7 @@ public:
     );
 
   static void describe_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -6381,7 +6381,7 @@ public:
     );
 
   static void move_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -6405,7 +6405,7 @@ public:
     );
 
   static void destroy_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -6417,16 +6417,16 @@ public:
 
 
 ///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration
+//               Strategized Proxy Broker Declaration 
 //
 
-class _TAO_CORBA_AbstractInterfaceDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_AbstractInterfaceDef_Proxy_Broker
+class  _TAO_CORBA_AbstractInterfaceDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_AbstractInterfaceDef_Proxy_Broker
 {
-public:
+public: 
   _TAO_CORBA_AbstractInterfaceDef_Strategized_Proxy_Broker (void);
-
+  
   virtual ~_TAO_CORBA_AbstractInterfaceDef_Strategized_Proxy_Broker (void);
-
+  
   virtual ::_TAO_CORBA_AbstractInterfaceDef_Proxy_Impl &select_proxy (
     ::CORBA_AbstractInterfaceDef *object,
     CORBA_Environment &ACE_TRY_ENV
@@ -6440,15 +6440,15 @@ private:
     int collocation_strategy,
     CORBA::Environment &ACE_TRY_ENV
   );
-
+  
 private:
-
+  
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
   ::_TAO_CORBA_AbstractInterfaceDef_Proxy_Impl
   *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-
+  
   TAO_SYNCH_MUTEX mutex_;
   // This funxtion is used to get an handle to the unique instance
   // of the Strategized Proxy Broker that is available for a given
@@ -6460,7 +6460,7 @@ public:
 
 
 //
-//            End Strategized Proxy Broker Declaration
+//            End Strategized Proxy Broker Declaration 
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -6468,17 +6468,17 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class _TAO_CORBA_AbstractInterfaceDef_ThruPOA_Proxy_Impl :
+class  _TAO_CORBA_AbstractInterfaceDef_ThruPOA_Proxy_Impl : 
   public virtual ::_TAO_CORBA_AbstractInterfaceDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
   public virtual ::_TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl
-
+  
 {
 public:
   _TAO_CORBA_AbstractInterfaceDef_ThruPOA_Proxy_Impl (void);
-
+  
   virtual ~_TAO_CORBA_AbstractInterfaceDef_ThruPOA_Proxy_Impl (void) { }
-
+  
 };
 
 
@@ -6492,7 +6492,7 @@ typedef POA_CORBA_LocalInterfaceDef *POA_CORBA_LocalInterfaceDef_ptr;
 class _TAO_CORBA_LocalInterfaceDef_ThruPOA_Proxy_Impl;
 class _TAO_CORBA_LocalInterfaceDef_Strategized_Proxy_Broker;
 
-class POA_CORBA_LocalInterfaceDef : public virtual POA_CORBA_InterfaceDef
+class  POA_CORBA_LocalInterfaceDef : public virtual POA_CORBA_InterfaceDef
 {
 protected:
   POA_CORBA_LocalInterfaceDef (void);
@@ -6504,7 +6504,7 @@ public:
 
   virtual CORBA::Boolean _is_a (
       const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
@@ -6540,7 +6540,7 @@ public:
     );
 
   ::CORBA_LocalInterfaceDef *_this (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
@@ -6558,12 +6558,12 @@ public:
       TAO_ServerRequest &req,
       void *obj,
       void *context,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
   static void is_a_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -6571,7 +6571,7 @@ public:
     );
 
   static void describe_interface_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -6579,7 +6579,7 @@ public:
     );
 
   static void create_attribute_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -6587,7 +6587,7 @@ public:
     );
 
   static void create_operation_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -6595,7 +6595,7 @@ public:
     );
 
   static void lookup_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -6603,7 +6603,7 @@ public:
     );
 
   static void contents_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -6611,7 +6611,7 @@ public:
     );
 
   static void lookup_name_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -6619,7 +6619,7 @@ public:
     );
 
   static void describe_contents_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -6627,7 +6627,7 @@ public:
     );
 
   static void create_module_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -6635,7 +6635,7 @@ public:
     );
 
   static void create_constant_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -6643,7 +6643,7 @@ public:
     );
 
   static void create_struct_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -6651,7 +6651,7 @@ public:
     );
 
   static void create_union_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -6659,7 +6659,7 @@ public:
     );
 
   static void create_enum_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -6667,7 +6667,7 @@ public:
     );
 
   static void create_alias_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -6675,7 +6675,7 @@ public:
     );
 
   static void create_interface_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -6683,7 +6683,7 @@ public:
     );
 
   static void create_value_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -6691,7 +6691,7 @@ public:
     );
 
   static void create_value_box_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -6699,7 +6699,7 @@ public:
     );
 
   static void create_exception_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -6707,7 +6707,7 @@ public:
     );
 
   static void create_native_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -6715,7 +6715,7 @@ public:
     );
 
   static void create_abstract_interface_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -6723,7 +6723,7 @@ public:
     );
 
   static void create_local_interface_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -6742,7 +6742,7 @@ public:
       TAO_ServerRequest &req,
       void *obj,
       void *context,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
@@ -6758,7 +6758,7 @@ public:
       TAO_ServerRequest &req,
       void *obj,
       void *context,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
@@ -6774,7 +6774,7 @@ public:
       TAO_ServerRequest &req,
       void *obj,
       void *context,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
@@ -6803,7 +6803,7 @@ public:
     );
 
   static void describe_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -6811,7 +6811,7 @@ public:
     );
 
   static void move_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -6835,7 +6835,7 @@ public:
     );
 
   static void destroy_skel (
-      TAO_ServerRequest &req,
+      TAO_ServerRequest &req, 
       void *obj,
       void *context,
       CORBA::Environment &ACE_TRY_ENV =
@@ -6847,16 +6847,16 @@ public:
 
 
 ///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration
+//               Strategized Proxy Broker Declaration 
 //
 
-class _TAO_CORBA_LocalInterfaceDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_LocalInterfaceDef_Proxy_Broker
+class  _TAO_CORBA_LocalInterfaceDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_LocalInterfaceDef_Proxy_Broker
 {
-public:
+public: 
   _TAO_CORBA_LocalInterfaceDef_Strategized_Proxy_Broker (void);
-
+  
   virtual ~_TAO_CORBA_LocalInterfaceDef_Strategized_Proxy_Broker (void);
-
+  
   virtual ::_TAO_CORBA_LocalInterfaceDef_Proxy_Impl &select_proxy (
     ::CORBA_LocalInterfaceDef *object,
     CORBA_Environment &ACE_TRY_ENV
@@ -6870,15 +6870,15 @@ private:
     int collocation_strategy,
     CORBA::Environment &ACE_TRY_ENV
   );
-
+  
 private:
-
+  
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
   ::_TAO_CORBA_LocalInterfaceDef_Proxy_Impl
   *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-
+  
   TAO_SYNCH_MUTEX mutex_;
   // This funxtion is used to get an handle to the unique instance
   // of the Strategized Proxy Broker that is available for a given
@@ -6890,7 +6890,7 @@ public:
 
 
 //
-//            End Strategized Proxy Broker Declaration
+//            End Strategized Proxy Broker Declaration 
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -6898,17 +6898,17 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class _TAO_CORBA_LocalInterfaceDef_ThruPOA_Proxy_Impl :
+class  _TAO_CORBA_LocalInterfaceDef_ThruPOA_Proxy_Impl : 
   public virtual ::_TAO_CORBA_LocalInterfaceDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
   public virtual ::_TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl
-
+  
 {
 public:
   _TAO_CORBA_LocalInterfaceDef_ThruPOA_Proxy_Impl (void);
-
+  
   virtual ~_TAO_CORBA_LocalInterfaceDef_ThruPOA_Proxy_Impl (void) { }
-
+  
 };
 
 
diff --git a/TAO/orbsvcs/IFR_Service/IFR_BasicS_T.h b/TAO/orbsvcs/IFR_Service/IFR_BasicS_T.h
index 8e0ec9e5727..8beacb70c71 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_BasicS_T.h
+++ b/TAO/orbsvcs/IFR_Service/IFR_BasicS_T.h
@@ -39,7 +39,7 @@ TAO_NAMESPACE_CLOSE // module CORBA
 
 // TIE class: Refer to CORBA v2.2, Section 20.34.4
 template <class T>
-class POA_CORBA_Repository_tie : public POA_CORBA_Repository
+class  POA_CORBA_Repository_tie : public POA_CORBA_Repository
 {
 public:
   POA_CORBA_Repository_tie (T &t);
@@ -377,7 +377,7 @@ public:
 
 // TIE class: Refer to CORBA v2.2, Section 20.34.4
 template <class T>
-class POA_CORBA_ModuleDef_tie : public POA_CORBA_ModuleDef
+class  POA_CORBA_ModuleDef_tie : public POA_CORBA_ModuleDef
 {
 public:
   POA_CORBA_ModuleDef_tie (T &t);
@@ -734,7 +734,7 @@ public:
 
 // TIE class: Refer to CORBA v2.2, Section 20.34.4
 template <class T>
-class POA_CORBA_ConstantDef_tie : public POA_CORBA_ConstantDef
+class  POA_CORBA_ConstantDef_tie : public POA_CORBA_ConstantDef
 {
 public:
   POA_CORBA_ConstantDef_tie (T &t);
@@ -929,7 +929,7 @@ public:
 
 // TIE class: Refer to CORBA v2.2, Section 20.34.4
 template <class T>
-class POA_CORBA_StructDef_tie : public POA_CORBA_StructDef
+class  POA_CORBA_StructDef_tie : public POA_CORBA_StructDef
 {
 public:
   POA_CORBA_StructDef_tie (T &t);
@@ -1311,7 +1311,7 @@ public:
 
 // TIE class: Refer to CORBA v2.2, Section 20.34.4
 template <class T>
-class POA_CORBA_UnionDef_tie : public POA_CORBA_UnionDef
+class  POA_CORBA_UnionDef_tie : public POA_CORBA_UnionDef
 {
 public:
   POA_CORBA_UnionDef_tie (T &t);
@@ -1718,7 +1718,7 @@ public:
 
 // TIE class: Refer to CORBA v2.2, Section 20.34.4
 template <class T>
-class POA_CORBA_EnumDef_tie : public POA_CORBA_EnumDef
+class  POA_CORBA_EnumDef_tie : public POA_CORBA_EnumDef
 {
 public:
   POA_CORBA_EnumDef_tie (T &t);
@@ -1896,7 +1896,7 @@ public:
 
 // TIE class: Refer to CORBA v2.2, Section 20.34.4
 template <class T>
-class POA_CORBA_AliasDef_tie : public POA_CORBA_AliasDef
+class  POA_CORBA_AliasDef_tie : public POA_CORBA_AliasDef
 {
 public:
   POA_CORBA_AliasDef_tie (T &t);
@@ -2074,7 +2074,7 @@ public:
 
 // TIE class: Refer to CORBA v2.2, Section 20.34.4
 template <class T>
-class POA_CORBA_NativeDef_tie : public POA_CORBA_NativeDef
+class  POA_CORBA_NativeDef_tie : public POA_CORBA_NativeDef
 {
 public:
   POA_CORBA_NativeDef_tie (T &t);
@@ -2235,7 +2235,7 @@ public:
 
 // TIE class: Refer to CORBA v2.2, Section 20.34.4
 template <class T>
-class POA_CORBA_PrimitiveDef_tie : public POA_CORBA_PrimitiveDef
+class  POA_CORBA_PrimitiveDef_tie : public POA_CORBA_PrimitiveDef
 {
 public:
   POA_CORBA_PrimitiveDef_tie (T &t);
@@ -2310,7 +2310,7 @@ public:
 
 // TIE class: Refer to CORBA v2.2, Section 20.34.4
 template <class T>
-class POA_CORBA_StringDef_tie : public POA_CORBA_StringDef
+class  POA_CORBA_StringDef_tie : public POA_CORBA_StringDef
 {
 public:
   POA_CORBA_StringDef_tie (T &t);
@@ -2394,7 +2394,7 @@ public:
 
 // TIE class: Refer to CORBA v2.2, Section 20.34.4
 template <class T>
-class POA_CORBA_WstringDef_tie : public POA_CORBA_WstringDef
+class  POA_CORBA_WstringDef_tie : public POA_CORBA_WstringDef
 {
 public:
   POA_CORBA_WstringDef_tie (T &t);
@@ -2478,7 +2478,7 @@ public:
 
 // TIE class: Refer to CORBA v2.2, Section 20.34.4
 template <class T>
-class POA_CORBA_SequenceDef_tie : public POA_CORBA_SequenceDef
+class  POA_CORBA_SequenceDef_tie : public POA_CORBA_SequenceDef
 {
 public:
   POA_CORBA_SequenceDef_tie (T &t);
@@ -2587,7 +2587,7 @@ public:
 
 // TIE class: Refer to CORBA v2.2, Section 20.34.4
 template <class T>
-class POA_CORBA_ArrayDef_tie : public POA_CORBA_ArrayDef
+class  POA_CORBA_ArrayDef_tie : public POA_CORBA_ArrayDef
 {
 public:
   POA_CORBA_ArrayDef_tie (T &t);
@@ -2696,7 +2696,7 @@ public:
 
 // TIE class: Refer to CORBA v2.2, Section 20.34.4
 template <class T>
-class POA_CORBA_ExceptionDef_tie : public POA_CORBA_ExceptionDef
+class  POA_CORBA_ExceptionDef_tie : public POA_CORBA_ExceptionDef
 {
 public:
   POA_CORBA_ExceptionDef_tie (T &t);
@@ -3078,7 +3078,7 @@ public:
 
 // TIE class: Refer to CORBA v2.2, Section 20.34.4
 template <class T>
-class POA_CORBA_AttributeDef_tie : public POA_CORBA_AttributeDef
+class  POA_CORBA_AttributeDef_tie : public POA_CORBA_AttributeDef
 {
 public:
   POA_CORBA_AttributeDef_tie (T &t);
@@ -3273,7 +3273,7 @@ public:
 
 // TIE class: Refer to CORBA v2.2, Section 20.34.4
 template <class T>
-class POA_CORBA_OperationDef_tie : public POA_CORBA_OperationDef
+class  POA_CORBA_OperationDef_tie : public POA_CORBA_OperationDef
 {
 public:
   POA_CORBA_OperationDef_tie (T &t);
@@ -3519,7 +3519,7 @@ public:
 
 // TIE class: Refer to CORBA v2.2, Section 20.34.4
 template <class T>
-class POA_CORBA_InterfaceDef_tie : public POA_CORBA_InterfaceDef
+class  POA_CORBA_InterfaceDef_tie : public POA_CORBA_InterfaceDef
 {
 public:
   POA_CORBA_InterfaceDef_tie (T &t);
@@ -3947,7 +3947,7 @@ public:
 
 // TIE class: Refer to CORBA v2.2, Section 20.34.4
 template <class T>
-class POA_CORBA_AbstractInterfaceDef_tie : public POA_CORBA_AbstractInterfaceDef
+class  POA_CORBA_AbstractInterfaceDef_tie : public POA_CORBA_AbstractInterfaceDef
 {
 public:
   POA_CORBA_AbstractInterfaceDef_tie (T &t);
@@ -4375,7 +4375,7 @@ public:
 
 // TIE class: Refer to CORBA v2.2, Section 20.34.4
 template <class T>
-class POA_CORBA_LocalInterfaceDef_tie : public POA_CORBA_LocalInterfaceDef
+class  POA_CORBA_LocalInterfaceDef_tie : public POA_CORBA_LocalInterfaceDef
 {
 public:
   POA_CORBA_LocalInterfaceDef_tie (T &t);
diff --git a/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.cpp b/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.cpp
index 050dde9efee..e9206e42f99 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.cpp
+++ b/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.cpp
@@ -54,9 +54,9 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 20:42:50 */
+/* starting time is 23:08:23 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /export/project/valinor/ossama/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_ComponentRepository_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_ComponentRepository_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_IR_ComponentRepository_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -199,7 +199,7 @@ TAO_IR_ComponentRepository_Perfect_Hash_OpTable::lookup (const char *str, unsign
     }
   return 0;
 }
-/* ending time is 20:42:50 */
+/* ending time is 23:08:24 */
 static TAO_IR_ComponentRepository_Perfect_Hash_OpTable tao_IR_ComponentRepository_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
@@ -777,9 +777,6 @@ void POA_IR::ComponentRepository::create_component_skel (
   POA_IR::ComponentRepository *_tao_impl =
     ACE_static_cast (POA_IR::ComponentRepository *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     IR::ComponentDef_var _tao_retval;
   CORBA::String_var id;
   CORBA::String_var name;
@@ -797,6 +794,9 @@ void POA_IR::ComponentRepository::create_component_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -869,6 +869,9 @@ void POA_IR::ComponentRepository::create_component_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -884,9 +887,6 @@ void POA_IR::ComponentRepository::create_home_skel (
   POA_IR::ComponentRepository *_tao_impl =
     ACE_static_cast (POA_IR::ComponentRepository *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     IR::HomeDef_var _tao_retval;
   CORBA::String_var id;
   CORBA::String_var name;
@@ -906,6 +906,9 @@ void POA_IR::ComponentRepository::create_home_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -980,6 +983,9 @@ void POA_IR::ComponentRepository::create_home_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -1152,9 +1158,9 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 20:42:50 */
+/* starting time is 23:08:24 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /export/project/valinor/ossama/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_ProvidesDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_ProvidesDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_IR_ProvidesDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -1280,7 +1286,7 @@ TAO_IR_ProvidesDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int l
     }
   return 0;
 }
-/* ending time is 20:42:50 */
+/* ending time is 23:08:24 */
 static TAO_IR_ProvidesDef_Perfect_Hash_OpTable tao_IR_ProvidesDef_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
@@ -1589,12 +1595,12 @@ void POA_IR::ProvidesDef::_get_interface_type_skel (
   POA_IR::ProvidesDef *_tao_impl =
     ACE_static_cast (POA_IR::ProvidesDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA_InterfaceDef_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -1657,6 +1663,9 @@ void POA_IR::ProvidesDef::_get_interface_type_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -1826,9 +1835,9 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 20:42:50 */
+/* starting time is 23:08:25 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /export/project/valinor/ossama/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_UsesDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_UsesDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_IR_UsesDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -1955,7 +1964,7 @@ TAO_IR_UsesDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
     }
   return 0;
 }
-/* ending time is 20:42:50 */
+/* ending time is 23:08:25 */
 static TAO_IR_UsesDef_Perfect_Hash_OpTable tao_IR_UsesDef_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
@@ -2420,12 +2429,12 @@ void POA_IR::UsesDef::_get_interface_type_skel (
   POA_IR::UsesDef *_tao_impl =
     ACE_static_cast (POA_IR::UsesDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA_InterfaceDef_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -2488,6 +2497,9 @@ void POA_IR::UsesDef::_get_interface_type_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -2502,12 +2514,12 @@ void POA_IR::UsesDef::_get_is_multiple_skel (
   POA_IR::UsesDef *_tao_impl =
     ACE_static_cast (POA_IR::UsesDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA::Boolean _tao_retval = 0;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -2569,6 +2581,9 @@ void POA_IR::UsesDef::_get_is_multiple_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -2738,9 +2753,9 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 20:42:50 */
+/* starting time is 23:08:25 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /export/project/valinor/ossama/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_EventDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_EventDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_IR_EventDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -2867,7 +2882,7 @@ TAO_IR_EventDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
     }
   return 0;
 }
-/* ending time is 20:42:50 */
+/* ending time is 23:08:25 */
 static TAO_IR_EventDef_Perfect_Hash_OpTable tao_IR_EventDef_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
@@ -3348,9 +3363,6 @@ void POA_IR::EventDef::is_a_skel (
   POA_IR::EventDef *_tao_impl =
     ACE_static_cast (POA_IR::EventDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA::Boolean _tao_retval = 0;
   CORBA::String_var event_id;
   if (!(
@@ -3360,6 +3372,9 @@ void POA_IR::EventDef::is_a_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -3423,6 +3438,9 @@ void POA_IR::EventDef::is_a_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -3437,12 +3455,12 @@ void POA_IR::EventDef::_get_event_skel (
   POA_IR::EventDef *_tao_impl =
     ACE_static_cast (POA_IR::EventDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA_ValueDef_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -3505,6 +3523,9 @@ void POA_IR::EventDef::_get_event_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -3674,9 +3695,9 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 20:42:50 */
+/* starting time is 23:08:26 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /export/project/valinor/ossama/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_EmitsDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_EmitsDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_IR_EmitsDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -3803,7 +3824,7 @@ TAO_IR_EmitsDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
     }
   return 0;
 }
-/* ending time is 20:42:50 */
+/* ending time is 23:08:26 */
 static TAO_IR_EmitsDef_Perfect_Hash_OpTable tao_IR_EmitsDef_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
@@ -4115,9 +4136,9 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 20:42:50 */
+/* starting time is 23:08:26 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /export/project/valinor/ossama/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_PublishesDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_PublishesDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_IR_PublishesDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -4244,7 +4265,7 @@ TAO_IR_PublishesDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
     }
   return 0;
 }
-/* ending time is 20:42:50 */
+/* ending time is 23:08:26 */
 static TAO_IR_PublishesDef_Perfect_Hash_OpTable tao_IR_PublishesDef_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
@@ -4556,9 +4577,9 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 20:42:51 */
+/* starting time is 23:08:27 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /export/project/valinor/ossama/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_ConsumesDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_ConsumesDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_IR_ConsumesDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -4685,7 +4706,7 @@ TAO_IR_ConsumesDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int l
     }
   return 0;
 }
-/* ending time is 20:42:51 */
+/* ending time is 23:08:27 */
 static TAO_IR_ConsumesDef_Perfect_Hash_OpTable tao_IR_ConsumesDef_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
@@ -4997,9 +5018,9 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 20:42:51 */
+/* starting time is 23:08:27 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /export/project/valinor/ossama/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_ComponentDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_ComponentDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_IR_ComponentDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -5167,7 +5188,7 @@ TAO_IR_ComponentDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
     }
   return 0;
 }
-/* ending time is 20:42:51 */
+/* ending time is 23:08:28 */
 static TAO_IR_ComponentDef_Perfect_Hash_OpTable tao_IR_ComponentDef_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
@@ -7728,12 +7749,12 @@ void POA_IR::ComponentDef::_get_supported_interfaces_skel (
   POA_IR::ComponentDef *_tao_impl =
     ACE_static_cast (POA_IR::ComponentDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA_InterfaceDefSeq_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -7796,6 +7817,9 @@ void POA_IR::ComponentDef::_get_supported_interfaces_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -7811,9 +7835,6 @@ void POA_IR::ComponentDef::_set_supported_interfaces_skel (
   POA_IR::ComponentDef *_tao_impl =
     ACE_static_cast (POA_IR::ComponentDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
   _tao_server_request.argument_flag (0);
     CORBA_InterfaceDefSeq supported_interfaces;
   if (!(
@@ -7823,6 +7844,9 @@ void POA_IR::ComponentDef::_set_supported_interfaces_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -7877,6 +7901,9 @@ void POA_IR::ComponentDef::_set_supported_interfaces_skel (
   
   _tao_server_request.init_reply ();
   
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -7891,12 +7918,12 @@ void POA_IR::ComponentDef::_get_base_component_skel (
   POA_IR::ComponentDef *_tao_impl =
     ACE_static_cast (POA_IR::ComponentDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     IR::ComponentDef_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -7959,6 +7986,9 @@ void POA_IR::ComponentDef::_get_base_component_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -7973,12 +8003,12 @@ void POA_IR::ComponentDef::_get_provides_interfaces_skel (
   POA_IR::ComponentDef *_tao_impl =
     ACE_static_cast (POA_IR::ComponentDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     IR::ProvidesDefSeq_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -8041,6 +8071,9 @@ void POA_IR::ComponentDef::_get_provides_interfaces_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -8055,12 +8088,12 @@ void POA_IR::ComponentDef::_get_uses_interfaces_skel (
   POA_IR::ComponentDef *_tao_impl =
     ACE_static_cast (POA_IR::ComponentDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     IR::UsesDefSeq_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -8123,6 +8156,9 @@ void POA_IR::ComponentDef::_get_uses_interfaces_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -8137,12 +8173,12 @@ void POA_IR::ComponentDef::_get_emits_events_skel (
   POA_IR::ComponentDef *_tao_impl =
     ACE_static_cast (POA_IR::ComponentDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     IR::EmitsDefSeq_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -8205,6 +8241,9 @@ void POA_IR::ComponentDef::_get_emits_events_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -8219,12 +8258,12 @@ void POA_IR::ComponentDef::_get_publishes_events_skel (
   POA_IR::ComponentDef *_tao_impl =
     ACE_static_cast (POA_IR::ComponentDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     IR::PublishesDefSeq_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -8287,6 +8326,9 @@ void POA_IR::ComponentDef::_get_publishes_events_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -8301,12 +8343,12 @@ void POA_IR::ComponentDef::_get_consumes_events_skel (
   POA_IR::ComponentDef *_tao_impl =
     ACE_static_cast (POA_IR::ComponentDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     IR::ConsumesDefSeq_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -8369,6 +8411,9 @@ void POA_IR::ComponentDef::_get_consumes_events_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -8383,12 +8428,12 @@ void POA_IR::ComponentDef::_get_is_basic_skel (
   POA_IR::ComponentDef *_tao_impl =
     ACE_static_cast (POA_IR::ComponentDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA::Boolean _tao_retval = 0;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -8450,6 +8495,9 @@ void POA_IR::ComponentDef::_get_is_basic_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -8465,9 +8513,6 @@ void POA_IR::ComponentDef::create_provides_skel (
   POA_IR::ComponentDef *_tao_impl =
     ACE_static_cast (POA_IR::ComponentDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     IR::ProvidesDef_var _tao_retval;
   CORBA::String_var id;
   CORBA::String_var name;
@@ -8483,6 +8528,9 @@ void POA_IR::ComponentDef::create_provides_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -8553,6 +8601,9 @@ void POA_IR::ComponentDef::create_provides_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -8568,9 +8619,6 @@ void POA_IR::ComponentDef::create_uses_skel (
   POA_IR::ComponentDef *_tao_impl =
     ACE_static_cast (POA_IR::ComponentDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     IR::UsesDef_var _tao_retval;
   CORBA::String_var id;
   CORBA::String_var name;
@@ -8588,6 +8636,9 @@ void POA_IR::ComponentDef::create_uses_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -8660,6 +8711,9 @@ void POA_IR::ComponentDef::create_uses_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -8675,9 +8729,6 @@ void POA_IR::ComponentDef::create_emits_skel (
   POA_IR::ComponentDef *_tao_impl =
     ACE_static_cast (POA_IR::ComponentDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     IR::EmitsDef_var _tao_retval;
   CORBA::String_var id;
   CORBA::String_var name;
@@ -8693,6 +8744,9 @@ void POA_IR::ComponentDef::create_emits_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -8763,6 +8817,9 @@ void POA_IR::ComponentDef::create_emits_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -8778,9 +8835,6 @@ void POA_IR::ComponentDef::create_publishes_skel (
   POA_IR::ComponentDef *_tao_impl =
     ACE_static_cast (POA_IR::ComponentDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     IR::PublishesDef_var _tao_retval;
   CORBA::String_var id;
   CORBA::String_var name;
@@ -8796,6 +8850,9 @@ void POA_IR::ComponentDef::create_publishes_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -8866,6 +8923,9 @@ void POA_IR::ComponentDef::create_publishes_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -8881,9 +8941,6 @@ void POA_IR::ComponentDef::create_consumes_skel (
   POA_IR::ComponentDef *_tao_impl =
     ACE_static_cast (POA_IR::ComponentDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     IR::ConsumesDef_var _tao_retval;
   CORBA::String_var id;
   CORBA::String_var name;
@@ -8899,6 +8956,9 @@ void POA_IR::ComponentDef::create_consumes_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -8969,6 +9029,9 @@ void POA_IR::ComponentDef::create_consumes_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -9147,9 +9210,9 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 20:42:51 */
+/* starting time is 23:08:30 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /export/project/valinor/ossama/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_PrimaryKeyDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_PrimaryKeyDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_IR_PrimaryKeyDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -9276,7 +9339,7 @@ TAO_IR_PrimaryKeyDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
     }
   return 0;
 }
-/* ending time is 20:42:51 */
+/* ending time is 23:08:30 */
 static TAO_IR_PrimaryKeyDef_Perfect_Hash_OpTable tao_IR_PrimaryKeyDef_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
@@ -9757,9 +9820,6 @@ void POA_IR::PrimaryKeyDef::is_a_skel (
   POA_IR::PrimaryKeyDef *_tao_impl =
     ACE_static_cast (POA_IR::PrimaryKeyDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA::Boolean _tao_retval = 0;
   CORBA::String_var primary_key_id;
   if (!(
@@ -9769,6 +9829,9 @@ void POA_IR::PrimaryKeyDef::is_a_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -9832,6 +9895,9 @@ void POA_IR::PrimaryKeyDef::is_a_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -9846,12 +9912,12 @@ void POA_IR::PrimaryKeyDef::_get_primary_key_skel (
   POA_IR::PrimaryKeyDef *_tao_impl =
     ACE_static_cast (POA_IR::PrimaryKeyDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA_ValueDef_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -9914,6 +9980,9 @@ void POA_IR::PrimaryKeyDef::_get_primary_key_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -10083,9 +10152,9 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 20:42:51 */
+/* starting time is 23:08:30 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /export/project/valinor/ossama/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_FactoryDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_FactoryDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_IR_FactoryDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -10272,7 +10341,7 @@ TAO_IR_FactoryDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int le
     }
   return 0;
 }
-/* ending time is 20:42:51 */
+/* ending time is 23:08:30 */
 static TAO_IR_FactoryDef_Perfect_Hash_OpTable tao_IR_FactoryDef_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
@@ -10584,9 +10653,9 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 20:42:51 */
+/* starting time is 23:08:31 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /export/project/valinor/ossama/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_FinderDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_FinderDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_IR_FinderDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -10773,7 +10842,7 @@ TAO_IR_FinderDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len
     }
   return 0;
 }
-/* ending time is 20:42:51 */
+/* ending time is 23:08:31 */
 static TAO_IR_FinderDef_Perfect_Hash_OpTable tao_IR_FinderDef_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
@@ -11085,9 +11154,9 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 20:42:51 */
+/* starting time is 23:08:31 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /export/project/valinor/ossama/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_HomeDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_HomeDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_IR_HomeDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -11249,7 +11318,7 @@ TAO_IR_HomeDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
     }
   return 0;
 }
-/* ending time is 20:42:51 */
+/* ending time is 23:08:31 */
 static TAO_IR_HomeDef_Perfect_Hash_OpTable tao_IR_HomeDef_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
@@ -12953,12 +13022,12 @@ void POA_IR::HomeDef::_get_base_home_skel (
   POA_IR::HomeDef *_tao_impl =
     ACE_static_cast (POA_IR::HomeDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     IR::HomeDef_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -13021,6 +13090,9 @@ void POA_IR::HomeDef::_get_base_home_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -13035,12 +13107,12 @@ void POA_IR::HomeDef::_get_managed_component_skel (
   POA_IR::HomeDef *_tao_impl =
     ACE_static_cast (POA_IR::HomeDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     IR::ComponentDef_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -13103,6 +13175,9 @@ void POA_IR::HomeDef::_get_managed_component_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -13117,12 +13192,12 @@ void POA_IR::HomeDef::_get_primary_key_skel (
   POA_IR::HomeDef *_tao_impl =
     ACE_static_cast (POA_IR::HomeDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     IR::PrimaryKeyDef_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -13185,6 +13260,9 @@ void POA_IR::HomeDef::_get_primary_key_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -13199,12 +13277,12 @@ void POA_IR::HomeDef::_get_factories_skel (
   POA_IR::HomeDef *_tao_impl =
     ACE_static_cast (POA_IR::HomeDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     IR::FactoryDefSeq_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -13267,6 +13345,9 @@ void POA_IR::HomeDef::_get_factories_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -13281,12 +13362,12 @@ void POA_IR::HomeDef::_get_finders_skel (
   POA_IR::HomeDef *_tao_impl =
     ACE_static_cast (POA_IR::HomeDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     IR::FinderDefSeq_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -13349,6 +13430,9 @@ void POA_IR::HomeDef::_get_finders_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -13363,12 +13447,12 @@ void POA_IR::HomeDef::_get_is_basic_skel (
   POA_IR::HomeDef *_tao_impl =
     ACE_static_cast (POA_IR::HomeDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA::Boolean _tao_retval = 0;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -13430,6 +13514,9 @@ void POA_IR::HomeDef::_get_is_basic_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -13445,9 +13532,6 @@ void POA_IR::HomeDef::create_primary_key_skel (
   POA_IR::HomeDef *_tao_impl =
     ACE_static_cast (POA_IR::HomeDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     IR::PrimaryKeyDef_var _tao_retval;
   CORBA::String_var id;
   CORBA::String_var name;
@@ -13463,6 +13547,9 @@ void POA_IR::HomeDef::create_primary_key_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -13533,6 +13620,9 @@ void POA_IR::HomeDef::create_primary_key_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -13548,9 +13638,6 @@ void POA_IR::HomeDef::create_factory_skel (
   POA_IR::HomeDef *_tao_impl =
     ACE_static_cast (POA_IR::HomeDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     IR::FactoryDef_var _tao_retval;
   CORBA::String_var id;
   CORBA::String_var name;
@@ -13568,6 +13655,9 @@ void POA_IR::HomeDef::create_factory_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -13640,6 +13730,9 @@ void POA_IR::HomeDef::create_factory_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -13655,9 +13748,6 @@ void POA_IR::HomeDef::create_finder_skel (
   POA_IR::HomeDef *_tao_impl =
     ACE_static_cast (POA_IR::HomeDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     IR::FinderDef_var _tao_retval;
   CORBA::String_var id;
   CORBA::String_var name;
@@ -13675,6 +13765,9 @@ void POA_IR::HomeDef::create_finder_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -13747,6 +13840,9 @@ void POA_IR::HomeDef::create_finder_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
diff --git a/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.h b/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.h
index 55b2b1f5ae8..e77ec38042c 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.h
+++ b/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.h
@@ -55,7 +55,7 @@ TAO_NAMESPACE  POA_IR
   class _TAO_ComponentRepository_ThruPOA_Proxy_Impl;
   class _TAO_ComponentRepository_Strategized_Proxy_Broker;
   
-  class ComponentRepository : public virtual POA_CORBA_Repository
+  class  ComponentRepository : public virtual POA_CORBA_Repository
   {
   protected:
     ComponentRepository (void);
@@ -374,7 +374,7 @@ TAO_NAMESPACE  POA_IR
   //               Strategized Proxy Broker Declaration 
   //
   
-  class _TAO_ComponentRepository_Strategized_Proxy_Broker : public virtual ::IR::_TAO_ComponentRepository_Proxy_Broker
+  class  _TAO_ComponentRepository_Strategized_Proxy_Broker : public virtual ::IR::_TAO_ComponentRepository_Proxy_Broker
   {
   public: 
     _TAO_ComponentRepository_Strategized_Proxy_Broker (void);
@@ -422,7 +422,7 @@ TAO_NAMESPACE  POA_IR
   //                    ThruPOA  Impl. Declaration
   //
   
-  class _TAO_ComponentRepository_ThruPOA_Proxy_Impl : 
+  class  _TAO_ComponentRepository_ThruPOA_Proxy_Impl : 
     public virtual ::IR::_TAO_ComponentRepository_Proxy_Impl,
     public virtual TAO_ThruPOA_Object_Proxy_Impl,
     public virtual ::_TAO_CORBA_Repository_ThruPOA_Proxy_Impl
@@ -474,7 +474,7 @@ TAO_NAMESPACE  POA_IR
   class _TAO_ProvidesDef_ThruPOA_Proxy_Impl;
   class _TAO_ProvidesDef_Strategized_Proxy_Broker;
   
-  class ProvidesDef : public virtual POA_CORBA_Contained
+  class  ProvidesDef : public virtual POA_CORBA_Contained
   {
   protected:
     ProvidesDef (void);
@@ -655,7 +655,7 @@ TAO_NAMESPACE  POA_IR
   //               Strategized Proxy Broker Declaration 
   //
   
-  class _TAO_ProvidesDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_ProvidesDef_Proxy_Broker
+  class  _TAO_ProvidesDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_ProvidesDef_Proxy_Broker
   {
   public: 
     _TAO_ProvidesDef_Strategized_Proxy_Broker (void);
@@ -703,7 +703,7 @@ private:
   //                    ThruPOA  Impl. Declaration
   //
   
-  class _TAO_ProvidesDef_ThruPOA_Proxy_Impl : 
+  class  _TAO_ProvidesDef_ThruPOA_Proxy_Impl : 
     public virtual ::IR::_TAO_ProvidesDef_Proxy_Impl,
     public virtual TAO_ThruPOA_Object_Proxy_Impl,
     public virtual ::_TAO_CORBA_Contained_ThruPOA_Proxy_Impl
@@ -736,7 +736,7 @@ private:
   class _TAO_UsesDef_ThruPOA_Proxy_Impl;
   class _TAO_UsesDef_Strategized_Proxy_Broker;
   
-  class UsesDef : public virtual POA_CORBA_Contained
+  class  UsesDef : public virtual POA_CORBA_Contained
   {
   protected:
     UsesDef (void);
@@ -932,7 +932,7 @@ private:
   //               Strategized Proxy Broker Declaration 
   //
   
-  class _TAO_UsesDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_UsesDef_Proxy_Broker
+  class  _TAO_UsesDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_UsesDef_Proxy_Broker
   {
   public: 
     _TAO_UsesDef_Strategized_Proxy_Broker (void);
@@ -980,7 +980,7 @@ private:
   //                    ThruPOA  Impl. Declaration
   //
   
-  class _TAO_UsesDef_ThruPOA_Proxy_Impl : 
+  class  _TAO_UsesDef_ThruPOA_Proxy_Impl : 
     public virtual ::IR::_TAO_UsesDef_Proxy_Impl,
     public virtual TAO_ThruPOA_Object_Proxy_Impl,
     public virtual ::_TAO_CORBA_Contained_ThruPOA_Proxy_Impl
@@ -1021,7 +1021,7 @@ private:
   class _TAO_EventDef_ThruPOA_Proxy_Impl;
   class _TAO_EventDef_Strategized_Proxy_Broker;
   
-  class EventDef : public virtual POA_CORBA_Contained
+  class  EventDef : public virtual POA_CORBA_Contained
   {
   protected:
     EventDef (void);
@@ -1218,7 +1218,7 @@ private:
   //               Strategized Proxy Broker Declaration 
   //
   
-  class _TAO_EventDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_EventDef_Proxy_Broker
+  class  _TAO_EventDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_EventDef_Proxy_Broker
   {
   public: 
     _TAO_EventDef_Strategized_Proxy_Broker (void);
@@ -1266,7 +1266,7 @@ private:
   //                    ThruPOA  Impl. Declaration
   //
   
-  class _TAO_EventDef_ThruPOA_Proxy_Impl : 
+  class  _TAO_EventDef_ThruPOA_Proxy_Impl : 
     public virtual ::IR::_TAO_EventDef_Proxy_Impl,
     public virtual TAO_ThruPOA_Object_Proxy_Impl,
     public virtual ::_TAO_CORBA_Contained_ThruPOA_Proxy_Impl
@@ -1308,7 +1308,7 @@ private:
   class _TAO_EmitsDef_ThruPOA_Proxy_Impl;
   class _TAO_EmitsDef_Strategized_Proxy_Broker;
   
-  class EmitsDef : public virtual EventDef
+  class  EmitsDef : public virtual EventDef
   {
   protected:
     EmitsDef (void);
@@ -1490,7 +1490,7 @@ private:
   //               Strategized Proxy Broker Declaration 
   //
   
-  class _TAO_EmitsDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_EmitsDef_Proxy_Broker
+  class  _TAO_EmitsDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_EmitsDef_Proxy_Broker
   {
   public: 
     _TAO_EmitsDef_Strategized_Proxy_Broker (void);
@@ -1538,7 +1538,7 @@ private:
   //                    ThruPOA  Impl. Declaration
   //
   
-  class _TAO_EmitsDef_ThruPOA_Proxy_Impl : 
+  class  _TAO_EmitsDef_ThruPOA_Proxy_Impl : 
     public virtual ::IR::_TAO_EmitsDef_Proxy_Impl,
     public virtual TAO_ThruPOA_Object_Proxy_Impl,
     public virtual ::POA_IR::_TAO_EventDef_ThruPOA_Proxy_Impl
@@ -1563,7 +1563,7 @@ private:
   class _TAO_PublishesDef_ThruPOA_Proxy_Impl;
   class _TAO_PublishesDef_Strategized_Proxy_Broker;
   
-  class PublishesDef : public virtual EventDef
+  class  PublishesDef : public virtual EventDef
   {
   protected:
     PublishesDef (void);
@@ -1745,7 +1745,7 @@ private:
   //               Strategized Proxy Broker Declaration 
   //
   
-  class _TAO_PublishesDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_PublishesDef_Proxy_Broker
+  class  _TAO_PublishesDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_PublishesDef_Proxy_Broker
   {
   public: 
     _TAO_PublishesDef_Strategized_Proxy_Broker (void);
@@ -1793,7 +1793,7 @@ private:
   //                    ThruPOA  Impl. Declaration
   //
   
-  class _TAO_PublishesDef_ThruPOA_Proxy_Impl : 
+  class  _TAO_PublishesDef_ThruPOA_Proxy_Impl : 
     public virtual ::IR::_TAO_PublishesDef_Proxy_Impl,
     public virtual TAO_ThruPOA_Object_Proxy_Impl,
     public virtual ::POA_IR::_TAO_EventDef_ThruPOA_Proxy_Impl
@@ -1818,7 +1818,7 @@ private:
   class _TAO_ConsumesDef_ThruPOA_Proxy_Impl;
   class _TAO_ConsumesDef_Strategized_Proxy_Broker;
   
-  class ConsumesDef : public virtual EventDef
+  class  ConsumesDef : public virtual EventDef
   {
   protected:
     ConsumesDef (void);
@@ -2000,7 +2000,7 @@ private:
   //               Strategized Proxy Broker Declaration 
   //
   
-  class _TAO_ConsumesDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_ConsumesDef_Proxy_Broker
+  class  _TAO_ConsumesDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_ConsumesDef_Proxy_Broker
   {
   public: 
     _TAO_ConsumesDef_Strategized_Proxy_Broker (void);
@@ -2048,7 +2048,7 @@ private:
   //                    ThruPOA  Impl. Declaration
   //
   
-  class _TAO_ConsumesDef_ThruPOA_Proxy_Impl : 
+  class  _TAO_ConsumesDef_ThruPOA_Proxy_Impl : 
     public virtual ::IR::_TAO_ConsumesDef_Proxy_Impl,
     public virtual TAO_ThruPOA_Object_Proxy_Impl,
     public virtual ::POA_IR::_TAO_EventDef_ThruPOA_Proxy_Impl
@@ -2073,7 +2073,7 @@ private:
   class _TAO_ComponentDef_ThruPOA_Proxy_Impl;
   class _TAO_ComponentDef_Strategized_Proxy_Broker;
   
-  class ComponentDef : public virtual POA_CORBA_InterfaceDef
+  class  ComponentDef : public virtual POA_CORBA_InterfaceDef
   {
   protected:
     ComponentDef (void);
@@ -2663,7 +2663,7 @@ private:
   //               Strategized Proxy Broker Declaration 
   //
   
-  class _TAO_ComponentDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_ComponentDef_Proxy_Broker
+  class  _TAO_ComponentDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_ComponentDef_Proxy_Broker
   {
   public: 
     _TAO_ComponentDef_Strategized_Proxy_Broker (void);
@@ -2711,7 +2711,7 @@ private:
   //                    ThruPOA  Impl. Declaration
   //
   
-  class _TAO_ComponentDef_ThruPOA_Proxy_Impl : 
+  class  _TAO_ComponentDef_ThruPOA_Proxy_Impl : 
     public virtual ::IR::_TAO_ComponentDef_Proxy_Impl,
     public virtual TAO_ThruPOA_Object_Proxy_Impl,
     public virtual ::_TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl
@@ -2870,7 +2870,7 @@ private:
   class _TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl;
   class _TAO_PrimaryKeyDef_Strategized_Proxy_Broker;
   
-  class PrimaryKeyDef : public virtual POA_CORBA_Contained
+  class  PrimaryKeyDef : public virtual POA_CORBA_Contained
   {
   protected:
     PrimaryKeyDef (void);
@@ -3067,7 +3067,7 @@ private:
   //               Strategized Proxy Broker Declaration 
   //
   
-  class _TAO_PrimaryKeyDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_PrimaryKeyDef_Proxy_Broker
+  class  _TAO_PrimaryKeyDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_PrimaryKeyDef_Proxy_Broker
   {
   public: 
     _TAO_PrimaryKeyDef_Strategized_Proxy_Broker (void);
@@ -3115,7 +3115,7 @@ private:
   //                    ThruPOA  Impl. Declaration
   //
   
-  class _TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl : 
+  class  _TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl : 
     public virtual ::IR::_TAO_PrimaryKeyDef_Proxy_Impl,
     public virtual TAO_ThruPOA_Object_Proxy_Impl,
     public virtual ::_TAO_CORBA_Contained_ThruPOA_Proxy_Impl
@@ -3157,7 +3157,7 @@ private:
   class _TAO_FactoryDef_ThruPOA_Proxy_Impl;
   class _TAO_FactoryDef_Strategized_Proxy_Broker;
   
-  class FactoryDef : public virtual POA_CORBA_OperationDef
+  class  FactoryDef : public virtual POA_CORBA_OperationDef
   {
   protected:
     FactoryDef (void);
@@ -3411,7 +3411,7 @@ private:
   //               Strategized Proxy Broker Declaration 
   //
   
-  class _TAO_FactoryDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_FactoryDef_Proxy_Broker
+  class  _TAO_FactoryDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_FactoryDef_Proxy_Broker
   {
   public: 
     _TAO_FactoryDef_Strategized_Proxy_Broker (void);
@@ -3459,7 +3459,7 @@ private:
   //                    ThruPOA  Impl. Declaration
   //
   
-  class _TAO_FactoryDef_ThruPOA_Proxy_Impl : 
+  class  _TAO_FactoryDef_ThruPOA_Proxy_Impl : 
     public virtual ::IR::_TAO_FactoryDef_Proxy_Impl,
     public virtual TAO_ThruPOA_Object_Proxy_Impl,
     public virtual ::_TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl
@@ -3484,7 +3484,7 @@ private:
   class _TAO_FinderDef_ThruPOA_Proxy_Impl;
   class _TAO_FinderDef_Strategized_Proxy_Broker;
   
-  class FinderDef : public virtual POA_CORBA_OperationDef
+  class  FinderDef : public virtual POA_CORBA_OperationDef
   {
   protected:
     FinderDef (void);
@@ -3738,7 +3738,7 @@ private:
   //               Strategized Proxy Broker Declaration 
   //
   
-  class _TAO_FinderDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_FinderDef_Proxy_Broker
+  class  _TAO_FinderDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_FinderDef_Proxy_Broker
   {
   public: 
     _TAO_FinderDef_Strategized_Proxy_Broker (void);
@@ -3786,7 +3786,7 @@ private:
   //                    ThruPOA  Impl. Declaration
   //
   
-  class _TAO_FinderDef_ThruPOA_Proxy_Impl : 
+  class  _TAO_FinderDef_ThruPOA_Proxy_Impl : 
     public virtual ::IR::_TAO_FinderDef_Proxy_Impl,
     public virtual TAO_ThruPOA_Object_Proxy_Impl,
     public virtual ::_TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl
@@ -3811,7 +3811,7 @@ private:
   class _TAO_HomeDef_ThruPOA_Proxy_Impl;
   class _TAO_HomeDef_Strategized_Proxy_Broker;
   
-  class HomeDef : public virtual POA_CORBA_InterfaceDef
+  class  HomeDef : public virtual POA_CORBA_InterfaceDef
   {
   protected:
     HomeDef (void);
@@ -4318,7 +4318,7 @@ private:
   //               Strategized Proxy Broker Declaration 
   //
   
-  class _TAO_HomeDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_HomeDef_Proxy_Broker
+  class  _TAO_HomeDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_HomeDef_Proxy_Broker
   {
   public: 
     _TAO_HomeDef_Strategized_Proxy_Broker (void);
@@ -4366,7 +4366,7 @@ private:
   //                    ThruPOA  Impl. Declaration
   //
   
-  class _TAO_HomeDef_ThruPOA_Proxy_Impl : 
+  class  _TAO_HomeDef_ThruPOA_Proxy_Impl : 
     public virtual ::IR::_TAO_HomeDef_Proxy_Impl,
     public virtual TAO_ThruPOA_Object_Proxy_Impl,
     public virtual ::_TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl
diff --git a/TAO/orbsvcs/IFR_Service/IFR_ComponentsS_T.h b/TAO/orbsvcs/IFR_Service/IFR_ComponentsS_T.h
index d9547342774..59b55988067 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_ComponentsS_T.h
+++ b/TAO/orbsvcs/IFR_Service/IFR_ComponentsS_T.h
@@ -36,7 +36,7 @@ TAO_NAMESPACE  POA_IR
 {
   // TIE class: Refer to CORBA v2.2, Section 20.34.4
   template <class T>
-  class ComponentRepository_tie : public ComponentRepository
+  class  ComponentRepository_tie : public ComponentRepository
   {
   public:
     ComponentRepository_tie (T &t);
@@ -401,7 +401,7 @@ TAO_NAMESPACE  POA_IR
 
   // TIE class: Refer to CORBA v2.2, Section 20.34.4
   template <class T>
-  class ProvidesDef_tie : public ProvidesDef
+  class  ProvidesDef_tie : public ProvidesDef
   {
   public:
     ProvidesDef_tie (T &t);
@@ -562,7 +562,7 @@ TAO_NAMESPACE  POA_IR
 
   // TIE class: Refer to CORBA v2.2, Section 20.34.4
   template <class T>
-  class UsesDef_tie : public UsesDef
+  class  UsesDef_tie : public UsesDef
   {
   public:
     UsesDef_tie (T &t);
@@ -731,7 +731,7 @@ TAO_NAMESPACE  POA_IR
 
   // TIE class: Refer to CORBA v2.2, Section 20.34.4
   template <class T>
-  class EventDef_tie : public EventDef
+  class  EventDef_tie : public EventDef
   {
   public:
     EventDef_tie (T &t);
@@ -901,7 +901,7 @@ TAO_NAMESPACE  POA_IR
 
   // TIE class: Refer to CORBA v2.2, Section 20.34.4
   template <class T>
-  class EmitsDef_tie : public EmitsDef
+  class  EmitsDef_tie : public EmitsDef
   {
   public:
     EmitsDef_tie (T &t);
@@ -1071,7 +1071,7 @@ TAO_NAMESPACE  POA_IR
 
   // TIE class: Refer to CORBA v2.2, Section 20.34.4
   template <class T>
-  class PublishesDef_tie : public PublishesDef
+  class  PublishesDef_tie : public PublishesDef
   {
   public:
     PublishesDef_tie (T &t);
@@ -1241,7 +1241,7 @@ TAO_NAMESPACE  POA_IR
 
   // TIE class: Refer to CORBA v2.2, Section 20.34.4
   template <class T>
-  class ConsumesDef_tie : public ConsumesDef
+  class  ConsumesDef_tie : public ConsumesDef
   {
   public:
     ConsumesDef_tie (T &t);
@@ -1411,7 +1411,7 @@ TAO_NAMESPACE  POA_IR
 
   // TIE class: Refer to CORBA v2.2, Section 20.34.4
   template <class T>
-  class ComponentDef_tie : public ComponentDef
+  class  ComponentDef_tie : public ComponentDef
   {
   public:
     ComponentDef_tie (T &t);
@@ -1973,7 +1973,7 @@ TAO_NAMESPACE  POA_IR
 
   // TIE class: Refer to CORBA v2.2, Section 20.34.4
   template <class T>
-  class PrimaryKeyDef_tie : public PrimaryKeyDef
+  class  PrimaryKeyDef_tie : public PrimaryKeyDef
   {
   public:
     PrimaryKeyDef_tie (T &t);
@@ -2143,7 +2143,7 @@ TAO_NAMESPACE  POA_IR
 
   // TIE class: Refer to CORBA v2.2, Section 20.34.4
   template <class T>
-  class FactoryDef_tie : public FactoryDef
+  class  FactoryDef_tie : public FactoryDef
   {
   public:
     FactoryDef_tie (T &t);
@@ -2389,7 +2389,7 @@ TAO_NAMESPACE  POA_IR
 
   // TIE class: Refer to CORBA v2.2, Section 20.34.4
   template <class T>
-  class FinderDef_tie : public FinderDef
+  class  FinderDef_tie : public FinderDef
   {
   public:
     FinderDef_tie (T &t);
@@ -2635,7 +2635,7 @@ TAO_NAMESPACE  POA_IR
 
   // TIE class: Refer to CORBA v2.2, Section 20.34.4
   template <class T>
-  class HomeDef_tie : public HomeDef
+  class  HomeDef_tie : public HomeDef
   {
   public:
     HomeDef_tie (T &t);
diff --git a/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.cpp b/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.cpp
index 4c8231bbc12..77a4d44ceeb 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.cpp
+++ b/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.cpp
@@ -54,9 +54,9 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 16:46:51 */
+/* starting time is 23:00:03 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /export/project/valinor/ossama/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_FixedDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_FixedDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_FixedDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -174,7 +174,7 @@ TAO_CORBA_FixedDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int l
     }
   return 0;
 }
-/* ending time is 16:46:51 */
+/* ending time is 23:00:03 */
 static TAO_CORBA_FixedDef_Perfect_Hash_OpTable tao_CORBA_FixedDef_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
@@ -955,12 +955,12 @@ void POA_CORBA_FixedDef::_get_digits_skel (
   POA_CORBA_FixedDef *_tao_impl =
     ACE_static_cast (POA_CORBA_FixedDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA::UShort _tao_retval = 0;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -1022,6 +1022,9 @@ void POA_CORBA_FixedDef::_get_digits_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -1037,9 +1040,6 @@ void POA_CORBA_FixedDef::_set_digits_skel (
   POA_CORBA_FixedDef *_tao_impl =
     ACE_static_cast (POA_CORBA_FixedDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
   _tao_server_request.argument_flag (0);
     CORBA::UShort digits;
   if (!(
@@ -1049,6 +1049,9 @@ void POA_CORBA_FixedDef::_set_digits_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -1103,6 +1106,9 @@ void POA_CORBA_FixedDef::_set_digits_skel (
   
   _tao_server_request.init_reply ();
   
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -1117,12 +1123,12 @@ void POA_CORBA_FixedDef::_get_scale_skel (
   POA_CORBA_FixedDef *_tao_impl =
     ACE_static_cast (POA_CORBA_FixedDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA::Short _tao_retval = 0;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -1184,6 +1190,9 @@ void POA_CORBA_FixedDef::_get_scale_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -1199,9 +1208,6 @@ void POA_CORBA_FixedDef::_set_scale_skel (
   POA_CORBA_FixedDef *_tao_impl =
     ACE_static_cast (POA_CORBA_FixedDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
   _tao_server_request.argument_flag (0);
     CORBA::Short scale;
   if (!(
@@ -1211,6 +1217,9 @@ void POA_CORBA_FixedDef::_set_scale_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -1265,6 +1274,9 @@ void POA_CORBA_FixedDef::_set_scale_skel (
   
   _tao_server_request.init_reply ();
   
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -1434,9 +1446,9 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 16:46:51 */
+/* starting time is 23:00:04 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /export/project/valinor/ossama/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ValueMemberDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ValueMemberDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ValueMemberDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -1566,7 +1578,7 @@ TAO_CORBA_ValueMemberDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned
     }
   return 0;
 }
-/* ending time is 16:46:51 */
+/* ending time is 23:00:04 */
 static TAO_CORBA_ValueMemberDef_Perfect_Hash_OpTable tao_CORBA_ValueMemberDef_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
@@ -2503,12 +2515,12 @@ void POA_CORBA_ValueMemberDef::_get_type_skel (
   POA_CORBA_ValueMemberDef *_tao_impl =
     ACE_static_cast (POA_CORBA_ValueMemberDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA::TypeCode_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -2571,6 +2583,9 @@ void POA_CORBA_ValueMemberDef::_get_type_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -2585,12 +2600,12 @@ void POA_CORBA_ValueMemberDef::_get_type_def_skel (
   POA_CORBA_ValueMemberDef *_tao_impl =
     ACE_static_cast (POA_CORBA_ValueMemberDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA_IDLType_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -2653,6 +2668,9 @@ void POA_CORBA_ValueMemberDef::_get_type_def_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -2668,9 +2686,6 @@ void POA_CORBA_ValueMemberDef::_set_type_def_skel (
   POA_CORBA_ValueMemberDef *_tao_impl =
     ACE_static_cast (POA_CORBA_ValueMemberDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
   _tao_server_request.argument_flag (0);
     CORBA_IDLType_var type_def;
   if (!(
@@ -2680,6 +2695,9 @@ void POA_CORBA_ValueMemberDef::_set_type_def_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -2734,6 +2752,9 @@ void POA_CORBA_ValueMemberDef::_set_type_def_skel (
   
   _tao_server_request.init_reply ();
   
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -2748,12 +2769,12 @@ void POA_CORBA_ValueMemberDef::_get_access_skel (
   POA_CORBA_ValueMemberDef *_tao_impl =
     ACE_static_cast (POA_CORBA_ValueMemberDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA::Visibility _tao_retval = 0;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -2815,6 +2836,9 @@ void POA_CORBA_ValueMemberDef::_get_access_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -2830,9 +2854,6 @@ void POA_CORBA_ValueMemberDef::_set_access_skel (
   POA_CORBA_ValueMemberDef *_tao_impl =
     ACE_static_cast (POA_CORBA_ValueMemberDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
   _tao_server_request.argument_flag (0);
     CORBA::Visibility access;
   if (!(
@@ -2842,6 +2863,9 @@ void POA_CORBA_ValueMemberDef::_set_access_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -2896,6 +2920,9 @@ void POA_CORBA_ValueMemberDef::_set_access_skel (
   
   _tao_server_request.init_reply ();
   
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -3065,9 +3092,9 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 16:46:51 */
+/* starting time is 23:00:05 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /export/project/valinor/ossama/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ValueDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ValueDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ValueDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -3233,7 +3260,7 @@ TAO_CORBA_ValueDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int l
     }
   return 0;
 }
-/* ending time is 16:46:51 */
+/* ending time is 23:00:05 */
 static TAO_CORBA_ValueDef_Perfect_Hash_OpTable tao_CORBA_ValueDef_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
@@ -6561,12 +6588,12 @@ void POA_CORBA_ValueDef::_get_supported_interfaces_skel (
   POA_CORBA_ValueDef *_tao_impl =
     ACE_static_cast (POA_CORBA_ValueDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA_InterfaceDefSeq_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -6629,6 +6656,9 @@ void POA_CORBA_ValueDef::_get_supported_interfaces_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -6644,9 +6674,6 @@ void POA_CORBA_ValueDef::_set_supported_interfaces_skel (
   POA_CORBA_ValueDef *_tao_impl =
     ACE_static_cast (POA_CORBA_ValueDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
   _tao_server_request.argument_flag (0);
     CORBA_InterfaceDefSeq supported_interfaces;
   if (!(
@@ -6656,6 +6683,9 @@ void POA_CORBA_ValueDef::_set_supported_interfaces_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -6710,6 +6740,9 @@ void POA_CORBA_ValueDef::_set_supported_interfaces_skel (
   
   _tao_server_request.init_reply ();
   
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -6724,12 +6757,12 @@ void POA_CORBA_ValueDef::_get_initializers_skel (
   POA_CORBA_ValueDef *_tao_impl =
     ACE_static_cast (POA_CORBA_ValueDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA_InitializerSeq_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -6792,6 +6825,9 @@ void POA_CORBA_ValueDef::_get_initializers_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -6807,9 +6843,6 @@ void POA_CORBA_ValueDef::_set_initializers_skel (
   POA_CORBA_ValueDef *_tao_impl =
     ACE_static_cast (POA_CORBA_ValueDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
   _tao_server_request.argument_flag (0);
     CORBA_InitializerSeq initializers;
   if (!(
@@ -6819,6 +6852,9 @@ void POA_CORBA_ValueDef::_set_initializers_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -6873,6 +6909,9 @@ void POA_CORBA_ValueDef::_set_initializers_skel (
   
   _tao_server_request.init_reply ();
   
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -6887,12 +6926,12 @@ void POA_CORBA_ValueDef::_get_base_value_skel (
   POA_CORBA_ValueDef *_tao_impl =
     ACE_static_cast (POA_CORBA_ValueDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA_ValueDef_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -6955,6 +6994,9 @@ void POA_CORBA_ValueDef::_get_base_value_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -6970,9 +7012,6 @@ void POA_CORBA_ValueDef::_set_base_value_skel (
   POA_CORBA_ValueDef *_tao_impl =
     ACE_static_cast (POA_CORBA_ValueDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
   _tao_server_request.argument_flag (0);
     CORBA_ValueDef_var base_value;
   if (!(
@@ -6982,6 +7021,9 @@ void POA_CORBA_ValueDef::_set_base_value_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -7036,6 +7078,9 @@ void POA_CORBA_ValueDef::_set_base_value_skel (
   
   _tao_server_request.init_reply ();
   
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -7050,12 +7095,12 @@ void POA_CORBA_ValueDef::_get_abstract_base_values_skel (
   POA_CORBA_ValueDef *_tao_impl =
     ACE_static_cast (POA_CORBA_ValueDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA_ValueDefSeq_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -7118,6 +7163,9 @@ void POA_CORBA_ValueDef::_get_abstract_base_values_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -7133,9 +7181,6 @@ void POA_CORBA_ValueDef::_set_abstract_base_values_skel (
   POA_CORBA_ValueDef *_tao_impl =
     ACE_static_cast (POA_CORBA_ValueDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
   _tao_server_request.argument_flag (0);
     CORBA_ValueDefSeq abstract_base_values;
   if (!(
@@ -7145,6 +7190,9 @@ void POA_CORBA_ValueDef::_set_abstract_base_values_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -7199,6 +7247,9 @@ void POA_CORBA_ValueDef::_set_abstract_base_values_skel (
   
   _tao_server_request.init_reply ();
   
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -7213,12 +7264,12 @@ void POA_CORBA_ValueDef::_get_is_abstract_skel (
   POA_CORBA_ValueDef *_tao_impl =
     ACE_static_cast (POA_CORBA_ValueDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA::Boolean _tao_retval = 0;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -7280,6 +7331,9 @@ void POA_CORBA_ValueDef::_get_is_abstract_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -7295,9 +7349,6 @@ void POA_CORBA_ValueDef::_set_is_abstract_skel (
   POA_CORBA_ValueDef *_tao_impl =
     ACE_static_cast (POA_CORBA_ValueDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
   _tao_server_request.argument_flag (0);
     CORBA::Boolean is_abstract;
   if (!(
@@ -7307,6 +7358,9 @@ void POA_CORBA_ValueDef::_set_is_abstract_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -7361,6 +7415,9 @@ void POA_CORBA_ValueDef::_set_is_abstract_skel (
   
   _tao_server_request.init_reply ();
   
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -7375,12 +7432,12 @@ void POA_CORBA_ValueDef::_get_is_custom_skel (
   POA_CORBA_ValueDef *_tao_impl =
     ACE_static_cast (POA_CORBA_ValueDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA::Boolean _tao_retval = 0;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -7442,6 +7499,9 @@ void POA_CORBA_ValueDef::_get_is_custom_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -7457,9 +7517,6 @@ void POA_CORBA_ValueDef::_set_is_custom_skel (
   POA_CORBA_ValueDef *_tao_impl =
     ACE_static_cast (POA_CORBA_ValueDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
   _tao_server_request.argument_flag (0);
     CORBA::Boolean is_custom;
   if (!(
@@ -7469,6 +7526,9 @@ void POA_CORBA_ValueDef::_set_is_custom_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -7523,6 +7583,9 @@ void POA_CORBA_ValueDef::_set_is_custom_skel (
   
   _tao_server_request.init_reply ();
   
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -7537,12 +7600,12 @@ void POA_CORBA_ValueDef::_get_is_truncatable_skel (
   POA_CORBA_ValueDef *_tao_impl =
     ACE_static_cast (POA_CORBA_ValueDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA::Boolean _tao_retval = 0;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -7604,6 +7667,9 @@ void POA_CORBA_ValueDef::_get_is_truncatable_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -7619,9 +7685,6 @@ void POA_CORBA_ValueDef::_set_is_truncatable_skel (
   POA_CORBA_ValueDef *_tao_impl =
     ACE_static_cast (POA_CORBA_ValueDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
   _tao_server_request.argument_flag (0);
     CORBA::Boolean is_truncatable;
   if (!(
@@ -7631,6 +7694,9 @@ void POA_CORBA_ValueDef::_set_is_truncatable_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -7685,6 +7751,9 @@ void POA_CORBA_ValueDef::_set_is_truncatable_skel (
   
   _tao_server_request.init_reply ();
   
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -7700,9 +7769,6 @@ void POA_CORBA_ValueDef::is_a_skel (
   POA_CORBA_ValueDef *_tao_impl =
     ACE_static_cast (POA_CORBA_ValueDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA::Boolean _tao_retval = 0;
   CORBA::String_var id;
   if (!(
@@ -7712,6 +7778,9 @@ void POA_CORBA_ValueDef::is_a_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -7775,6 +7844,9 @@ void POA_CORBA_ValueDef::is_a_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -7789,12 +7861,12 @@ void POA_CORBA_ValueDef::describe_value_skel (
   POA_CORBA_ValueDef *_tao_impl =
     ACE_static_cast (POA_CORBA_ValueDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA_ValueDef::FullValueDescription_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -7857,6 +7929,9 @@ void POA_CORBA_ValueDef::describe_value_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -7872,9 +7947,6 @@ void POA_CORBA_ValueDef::create_value_member_skel (
   POA_CORBA_ValueDef *_tao_impl =
     ACE_static_cast (POA_CORBA_ValueDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA_ValueMemberDef_var _tao_retval;
   CORBA::String_var id;
   CORBA::String_var name;
@@ -7892,6 +7964,9 @@ void POA_CORBA_ValueDef::create_value_member_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -7964,6 +8039,9 @@ void POA_CORBA_ValueDef::create_value_member_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -7979,9 +8057,6 @@ void POA_CORBA_ValueDef::create_attribute_skel (
   POA_CORBA_ValueDef *_tao_impl =
     ACE_static_cast (POA_CORBA_ValueDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA_AttributeDef_var _tao_retval;
   CORBA::String_var id;
   CORBA::String_var name;
@@ -7999,6 +8074,9 @@ void POA_CORBA_ValueDef::create_attribute_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -8071,6 +8149,9 @@ void POA_CORBA_ValueDef::create_attribute_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -8086,9 +8167,6 @@ void POA_CORBA_ValueDef::create_operation_skel (
   POA_CORBA_ValueDef *_tao_impl =
     ACE_static_cast (POA_CORBA_ValueDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA_OperationDef_var _tao_retval;
   CORBA::String_var id;
   CORBA::String_var name;
@@ -8112,6 +8190,9 @@ void POA_CORBA_ValueDef::create_operation_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -8190,6 +8271,9 @@ void POA_CORBA_ValueDef::create_operation_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -8365,9 +8449,9 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 16:46:51 */
+/* starting time is 23:00:08 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /export/project/valinor/ossama/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ValueBoxDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ValueBoxDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ValueBoxDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -8495,7 +8579,7 @@ TAO_CORBA_ValueBoxDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned in
     }
   return 0;
 }
-/* ending time is 16:46:51 */
+/* ending time is 23:00:08 */
 static TAO_CORBA_ValueBoxDef_Perfect_Hash_OpTable tao_CORBA_ValueBoxDef_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
@@ -8964,12 +9048,12 @@ void POA_CORBA_ValueBoxDef::_get_original_type_def_skel (
   POA_CORBA_ValueBoxDef *_tao_impl =
     ACE_static_cast (POA_CORBA_ValueBoxDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
     CORBA_IDLType_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -9032,6 +9116,9 @@ void POA_CORBA_ValueBoxDef::_get_original_type_def_skel (
     ))
     ACE_THROW (CORBA::MARSHAL());
 
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -9047,9 +9134,6 @@ void POA_CORBA_ValueBoxDef::_set_original_type_def_skel (
   POA_CORBA_ValueBoxDef *_tao_impl =
     ACE_static_cast (POA_CORBA_ValueBoxDef *, _tao_object_reference);
   
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-  
   _tao_server_request.argument_flag (0);
     CORBA_IDLType_var original_type_def;
   if (!(
@@ -9059,6 +9143,9 @@ void POA_CORBA_ValueBoxDef::_set_original_type_def_skel (
 
 
 #if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
@@ -9113,6 +9200,9 @@ void POA_CORBA_ValueBoxDef::_set_original_type_def_skel (
   
   _tao_server_request.init_reply ();
   
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
+  
   // In case ACE_TRY_ENV is not used in this function
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
diff --git a/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.h b/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.h
index e3e37e392ca..70c12c62795 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.h
+++ b/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.h
@@ -53,7 +53,7 @@ typedef POA_CORBA_FixedDef *POA_CORBA_FixedDef_ptr;
 class _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl;
 class _TAO_CORBA_FixedDef_Strategized_Proxy_Broker;
 
-class POA_CORBA_FixedDef : public virtual POA_CORBA_IDLType
+class  POA_CORBA_FixedDef : public virtual POA_CORBA_IDLType
 {
 protected:
   POA_CORBA_FixedDef (void);
@@ -201,7 +201,7 @@ public:
 //               Strategized Proxy Broker Declaration 
 //
 
-class _TAO_CORBA_FixedDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_FixedDef_Proxy_Broker
+class  _TAO_CORBA_FixedDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_FixedDef_Proxy_Broker
 {
 public: 
   _TAO_CORBA_FixedDef_Strategized_Proxy_Broker (void);
@@ -249,7 +249,7 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl : 
+class  _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl : 
   public virtual ::_TAO_CORBA_FixedDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
   public virtual ::_TAO_CORBA_IDLType_ThruPOA_Proxy_Impl
@@ -308,7 +308,7 @@ typedef POA_CORBA_ValueMemberDef *POA_CORBA_ValueMemberDef_ptr;
 class _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl;
 class _TAO_CORBA_ValueMemberDef_Strategized_Proxy_Broker;
 
-class POA_CORBA_ValueMemberDef : public virtual POA_CORBA_Contained
+class  POA_CORBA_ValueMemberDef : public virtual POA_CORBA_Contained
 {
 protected:
   POA_CORBA_ValueMemberDef (void);
@@ -551,7 +551,7 @@ public:
 //               Strategized Proxy Broker Declaration 
 //
 
-class _TAO_CORBA_ValueMemberDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_ValueMemberDef_Proxy_Broker
+class  _TAO_CORBA_ValueMemberDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_ValueMemberDef_Proxy_Broker
 {
 public: 
   _TAO_CORBA_ValueMemberDef_Strategized_Proxy_Broker (void);
@@ -599,7 +599,7 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl : 
+class  _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl : 
   public virtual ::_TAO_CORBA_ValueMemberDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
   public virtual ::_TAO_CORBA_Contained_ThruPOA_Proxy_Impl
@@ -666,7 +666,7 @@ typedef POA_CORBA_ValueDef *POA_CORBA_ValueDef_ptr;
 class _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl;
 class _TAO_CORBA_ValueDef_Strategized_Proxy_Broker;
 
-class POA_CORBA_ValueDef : public virtual POA_CORBA_Container, public virtual POA_CORBA_Contained, public virtual POA_CORBA_IDLType
+class  POA_CORBA_ValueDef : public virtual POA_CORBA_Container, public virtual POA_CORBA_Contained, public virtual POA_CORBA_IDLType
 {
 protected:
   POA_CORBA_ValueDef (void);
@@ -1287,7 +1287,7 @@ public:
 //               Strategized Proxy Broker Declaration 
 //
 
-class _TAO_CORBA_ValueDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_ValueDef_Proxy_Broker
+class  _TAO_CORBA_ValueDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_ValueDef_Proxy_Broker
 {
 public: 
   _TAO_CORBA_ValueDef_Strategized_Proxy_Broker (void);
@@ -1335,7 +1335,7 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl : 
+class  _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl : 
   public virtual ::_TAO_CORBA_ValueDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
   public virtual ::_TAO_CORBA_Container_ThruPOA_Proxy_Impl, 
@@ -1540,7 +1540,7 @@ typedef POA_CORBA_ValueBoxDef *POA_CORBA_ValueBoxDef_ptr;
 class _TAO_CORBA_ValueBoxDef_ThruPOA_Proxy_Impl;
 class _TAO_CORBA_ValueBoxDef_Strategized_Proxy_Broker;
 
-class POA_CORBA_ValueBoxDef : public virtual POA_CORBA_TypedefDef
+class  POA_CORBA_ValueBoxDef : public virtual POA_CORBA_TypedefDef
 {
 protected:
   POA_CORBA_ValueBoxDef (void);
@@ -1745,7 +1745,7 @@ public:
 //               Strategized Proxy Broker Declaration 
 //
 
-class _TAO_CORBA_ValueBoxDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_ValueBoxDef_Proxy_Broker
+class  _TAO_CORBA_ValueBoxDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_ValueBoxDef_Proxy_Broker
 {
 public: 
   _TAO_CORBA_ValueBoxDef_Strategized_Proxy_Broker (void);
@@ -1793,7 +1793,7 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class _TAO_CORBA_ValueBoxDef_ThruPOA_Proxy_Impl : 
+class  _TAO_CORBA_ValueBoxDef_ThruPOA_Proxy_Impl : 
   public virtual ::_TAO_CORBA_ValueBoxDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
   public virtual ::_TAO_CORBA_TypedefDef_ThruPOA_Proxy_Impl
diff --git a/TAO/orbsvcs/IFR_Service/IFR_ExtendedS_T.h b/TAO/orbsvcs/IFR_Service/IFR_ExtendedS_T.h
index a75224869c4..15c28e07b90 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_ExtendedS_T.h
+++ b/TAO/orbsvcs/IFR_Service/IFR_ExtendedS_T.h
@@ -39,7 +39,7 @@ TAO_NAMESPACE_CLOSE // module CORBA
 
 // TIE class: Refer to CORBA v2.2, Section 20.34.4
 template <class T>
-class POA_CORBA_FixedDef_tie : public POA_CORBA_FixedDef
+class  POA_CORBA_FixedDef_tie : public POA_CORBA_FixedDef
 {
 public:
   POA_CORBA_FixedDef_tie (T &t);
@@ -140,7 +140,7 @@ public:
 
 // TIE class: Refer to CORBA v2.2, Section 20.34.4
 template <class T>
-class POA_CORBA_ValueMemberDef_tie : public POA_CORBA_ValueMemberDef
+class  POA_CORBA_ValueMemberDef_tie : public POA_CORBA_ValueMemberDef
 {
 public:
   POA_CORBA_ValueMemberDef_tie (T &t);
@@ -335,7 +335,7 @@ public:
 
 // TIE class: Refer to CORBA v2.2, Section 20.34.4
 template <class T>
-class POA_CORBA_ValueDef_tie : public POA_CORBA_ValueDef
+class  POA_CORBA_ValueDef_tie : public POA_CORBA_ValueDef
 {
 public:
   POA_CORBA_ValueDef_tie (T &t);
@@ -878,7 +878,7 @@ public:
 
 // TIE class: Refer to CORBA v2.2, Section 20.34.4
 template <class T>
-class POA_CORBA_ValueBoxDef_tie : public POA_CORBA_ValueBoxDef
+class  POA_CORBA_ValueBoxDef_tie : public POA_CORBA_ValueBoxDef
 {
 public:
   POA_CORBA_ValueBoxDef_tie (T &t);
diff --git a/TAO/tao/IFR_Client/diffs/IFR_Base.pidl.diff b/TAO/tao/IFR_Client/diffs/IFR_Base.pidl.diff
index 346c1cba939..11b9b1fc5b5 100644
--- a/TAO/tao/IFR_Client/diffs/IFR_Base.pidl.diff
+++ b/TAO/tao/IFR_Client/diffs/IFR_Base.pidl.diff
@@ -1,395 +1,402 @@
---- orig/IFR_Base.pidl	Mon Apr 23 20:19:25 2001
-+++ IFR_Base.pidl	Thu Apr 19 00:40:20 2001
-@@ -66,12 +66,14 @@
+--- IFR_Base.pidl.old	Fri Jun  1 22:22:17 2001
++++ IFR_Base.pidl	Fri Jun  1 22:17:44 2001
+@@ -66,14 +66,12 @@
  #ifndef _IFR_BASE_IDL_
  #define _IFR_BASE_IDL_
  
--#include <orb.idl>
--
++#include <orb.idl>
++
  #pragma prefix "omg.org"
  
- module CORBA
+ module CORBA 
  {
-+  typedef string Identifier;
-+  typedef string ScopedName;
-+  typedef string RepositoryId;
-+
+-  typedef string Identifier;
+-  typedef string ScopedName;
+-  typedef string RepositoryId;
+-
    enum DefinitionKind 
    {
      dk_none, 
-@@ -101,34 +103,36 @@
+@@ -103,36 +101,34 @@
      dk_AbstractInterface,
      dk_LocalInterface
    };
--};
++};
  
--  interface CORBA_IRObject 
-+  interface IRObject 
+-  interface IRObject 
++  interface CORBA_IRObject 
    {
      // read interface
--    readonly attribute CORBA::DefinitionKind def_kind;
-+    readonly attribute DefinitionKind def_kind;
+-    readonly attribute DefinitionKind def_kind;
++    readonly attribute CORBA::DefinitionKind def_kind;
      // write interface
      void destroy ();
    };
  
--  interface CORBA_Repository;
--  interface CORBA_Container;
-+  typedef string VersionSpec;
+-  typedef string VersionSpec;
++  interface CORBA_Repository;
++  interface CORBA_Container;
  
--  interface CORBA_Contained : CORBA_IRObject 
-+  interface Contained;
-+  interface Repository;
-+  interface Container;
-+
-+  interface Contained : IRObject 
+-  interface Contained;
+-  interface Repository;
+-  interface Container;
+-
+-  interface Contained : IRObject 
++  interface CORBA_Contained : CORBA_IRObject 
    {
      // read/write interface
--    attribute string id;
--    attribute string name;
--    attribute string version;
-+    attribute RepositoryId id;
-+    attribute Identifier name;
-+    attribute VersionSpec version;
+-    attribute RepositoryId id;
+-    attribute Identifier name;
+-    attribute VersionSpec version;
++    attribute string id;
++    attribute string name;
++    attribute string version;
  
      // read interface
--    readonly attribute CORBA_Container defined_in;
--    readonly attribute string absolute_name;
--    readonly attribute CORBA_Repository containing_repository;
-+    readonly attribute Container defined_in;
-+    readonly attribute ScopedName absolute_name;
-+    readonly attribute Repository containing_repository;
+-    readonly attribute Container defined_in;
+-    readonly attribute ScopedName absolute_name;
+-    readonly attribute Repository containing_repository;
++    readonly attribute CORBA_Container defined_in;
++    readonly attribute string absolute_name;
++    readonly attribute CORBA_Repository containing_repository;
      
      struct Description 
      {
--      CORBA::DefinitionKind kind;
-+      DefinitionKind kind;
+-      DefinitionKind kind;
++      CORBA::DefinitionKind kind;
        any value;
      };
  
-@@ -136,194 +140,195 @@
+@@ -140,196 +136,196 @@
  
      // write interface
      void move (
--        in CORBA_Container new_container,
--        in string new_name,
--        in string new_version
-+        in Container new_container,
-+        in Identifier new_name,
-+        in VersionSpec new_version
+-        in Container new_container,
+-        in Identifier new_name,
+-        in VersionSpec new_version
++        in CORBA_Container new_container,
++        in string new_name,
++        in string new_version
        );
    };
  
--  typedef sequence <CORBA_Contained> CORBA_ContainedSeq;
-+  typedef sequence <Contained> ContainedSeq;
+-  typedef sequence <Contained> ContainedSeq;
++  typedef sequence <CORBA_Contained> CORBA_ContainedSeq;
  
--  interface CORBA_ModuleDef;
--  interface CORBA_ConstantDef;
--  interface CORBA_IDLType;
--  interface CORBA_StructDef;
--  interface CORBA_UnionDef;
--  interface CORBA_EnumDef;
--  interface CORBA_AliasDef;
--  interface CORBA_InterfaceDef;
--  typedef sequence<CORBA_InterfaceDef> CORBA_InterfaceDefSeq;
--  interface CORBA_ExceptionDef;
--  interface CORBA_NativeDef;
--  interface CORBA_ValueDef;
--  typedef sequence<CORBA_ValueDef> CORBA_ValueDefSeq;
--  interface CORBA_ValueBoxDef;
--  interface CORBA_AbstractInterfaceDef;
--  typedef sequence<CORBA_AbstractInterfaceDef> CORBA_AbstractInterfaceDefSeq;
--  interface CORBA_LocalInterfaceDef;
--  typedef sequence<CORBA_LocalInterfaceDef> CORBA_LocalInterfaceDefSeq;
-+  interface ModuleDef;
-+  interface ConstantDef;
-+  interface IDLType;
-+  interface StructDef;
-+  interface UnionDef;
-+  interface EnumDef;
-+  interface AliasDef;
-+  interface InterfaceDef;
-+  typedef sequence<InterfaceDef> InterfaceDefSeq;
-+  interface ExceptionDef;
-+  interface NativeDef;
-+  interface ValueDef;
-+  typedef sequence<ValueDef> ValueDefSeq;
-+  interface ValueBoxDef;
-+  interface AbstractInterfaceDef;
-+  typedef sequence<AbstractInterfaceDef> AbstractInterfaceDefSeq;
-+  interface LocalInterfaceDef;
-+  typedef sequence<LocalInterfaceDef> LocalInterfaceDefSeq;
+-  interface ModuleDef;
+-  interface ConstantDef;
+-  interface IDLType;
+-  interface StructDef;
+-  interface UnionDef;
+-  interface EnumDef;
+-  interface AliasDef;
+-  interface InterfaceDef;
+-  typedef sequence<InterfaceDef> InterfaceDefSeq;
+-  interface ExceptionDef;
+-  interface NativeDef;
+-  interface ValueDef;
+-  typedef sequence<ValueDef> ValueDefSeq;
+-  interface ValueBoxDef;
+-  interface AbstractInterfaceDef;
+-  typedef sequence<AbstractInterfaceDef> AbstractInterfaceDefSeq;
+-  interface LocalInterfaceDef;
+-  typedef sequence<LocalInterfaceDef> LocalInterfaceDefSeq;
++  interface CORBA_ModuleDef;
++  interface CORBA_ConstantDef;
++  interface CORBA_IDLType;
++  interface CORBA_StructDef;
++  interface CORBA_UnionDef;
++  interface CORBA_EnumDef;
++  interface CORBA_AliasDef;
++  interface CORBA_InterfaceDef;
++  typedef sequence<CORBA_InterfaceDef> CORBA_InterfaceDefSeq;
++  interface CORBA_ExceptionDef;
++  interface CORBA_NativeDef;
++  interface CORBA_ValueDef;
++  typedef sequence<CORBA_ValueDef> CORBA_ValueDefSeq;
++  interface CORBA_ValueBoxDef;
++  interface CORBA_AbstractInterfaceDef;
++  typedef sequence<CORBA_AbstractInterfaceDef> CORBA_AbstractInterfaceDefSeq;
++  interface CORBA_LocalInterfaceDef;
++  typedef sequence<CORBA_LocalInterfaceDef> CORBA_LocalInterfaceDefSeq;
  
--  struct CORBA_StructMember 
-+  struct StructMember 
+-  struct StructMember 
++  struct CORBA_StructMember 
    {
--    string name;
--    CORBA::TypeCode type;
--    CORBA_IDLType type_def;
-+    Identifier name;
-+    TypeCode type;
-+    IDLType type_def;
+-    Identifier name;
+-    TypeCode type;
+-    IDLType type_def;
++    string name;
++    CORBA::TypeCode type;
++    CORBA_IDLType type_def;
    };
  
--  typedef sequence <CORBA_StructMember> CORBA_StructMemberSeq;
-+  typedef sequence <StructMember> StructMemberSeq;
+-  typedef sequence <StructMember> StructMemberSeq;
++  typedef sequence <CORBA_StructMember> CORBA_StructMemberSeq;
  
--  struct CORBA_Initializer 
-+  struct Initializer 
+-  struct Initializer 
++  struct CORBA_Initializer 
    {
--    CORBA_StructMemberSeq members;
--    string name;
-+    StructMemberSeq members;
-+    Identifier name;
+-    StructMemberSeq members;
+-    Identifier name;
++    CORBA_StructMemberSeq members;
++    string name;
    };
  
--  typedef sequence <CORBA_Initializer> CORBA_InitializerSeq;
-+  typedef sequence <Initializer> InitializerSeq;
+-  typedef sequence <Initializer> InitializerSeq;
++  typedef sequence <CORBA_Initializer> CORBA_InitializerSeq;
  
--  struct CORBA_UnionMember 
-+  struct UnionMember 
+-  struct UnionMember 
++  struct CORBA_UnionMember 
    {
--    string name;
-+    Identifier name;
+-    Identifier name;
++    string name;
      any label;
--    CORBA::TypeCode type;
--    CORBA_IDLType type_def;
-+    TypeCode type;
-+    IDLType type_def;
+-    TypeCode type;
+-    IDLType type_def;
++    CORBA::TypeCode type;
++    CORBA_IDLType type_def;
    };
  
--  typedef sequence <CORBA_UnionMember> CORBA_UnionMemberSeq;
--  typedef sequence <string> CORBA_EnumMemberSeq;
-+  typedef sequence <UnionMember> UnionMemberSeq;
-+  typedef sequence <Identifier> EnumMemberSeq;
+-  typedef sequence <UnionMember> UnionMemberSeq;
+-  typedef sequence <Identifier> EnumMemberSeq;
++  typedef sequence <CORBA_UnionMember> CORBA_UnionMemberSeq;
++  typedef sequence <string> CORBA_EnumMemberSeq;
  
--  interface CORBA_Container : CORBA_IRObject 
-+  interface Container : IRObject 
+-  interface Container : IRObject 
++  interface CORBA_Container : CORBA_IRObject 
    {
      // read interface
--    CORBA_Contained lookup (
--        in string search_name
-+    Contained lookup (
-+        in ScopedName search_name
+-    Contained lookup (
+-        in ScopedName search_name
++    CORBA_Contained lookup (
++        in string search_name
        );
--    CORBA_ContainedSeq contents (
--        in CORBA::DefinitionKind limit_type,
-+    ContainedSeq contents (
-+        in DefinitionKind limit_type,
+-    ContainedSeq contents (
+-        in DefinitionKind limit_type,
++    CORBA_ContainedSeq contents (
++        in CORBA::DefinitionKind limit_type,
          in boolean exclude_inherited
        );
--    CORBA_ContainedSeq lookup_name (
--        in string search_name,
-+    ContainedSeq lookup_name (
-+        in Identifier search_name,
+-    ContainedSeq lookup_name (
+-        in Identifier search_name,
++    CORBA_ContainedSeq lookup_name (
++        in string search_name,
          in long levels_to_search,
--        in CORBA::DefinitionKind limit_type,
-+        in DefinitionKind limit_type,
+-        in DefinitionKind limit_type,
++        in CORBA::DefinitionKind limit_type,
          in boolean exclude_inherited
        );
      struct Description 
      {
--      CORBA_Contained contained_object;
--      CORBA::DefinitionKind kind;
-+      Contained contained_object;
-+      DefinitionKind kind;
+-      Contained contained_object;
+-      DefinitionKind kind;
++      CORBA_Contained contained_object;
++      CORBA::DefinitionKind kind;
        any value;
      };
  
      typedef sequence<Description> DescriptionSeq;
  
      DescriptionSeq describe_contents (
--        in CORBA::DefinitionKind limit_type,
-+        in DefinitionKind limit_type,
+-        in DefinitionKind limit_type,
++        in CORBA::DefinitionKind limit_type,
          in boolean exclude_inherited,
          in long max_returned_objs
        );
      // write interface
--    CORBA_ModuleDef create_module (
--        in string id,
--        in string name,
--        in string version
+-    ModuleDef create_module (
+-        in RepositoryId id,
+-        in Identifier name,
+-        in VersionSpec version
 -      );
--    CORBA_ConstantDef create_constant (
--        in string id,
--        in string name,
--        in string version,
--        in CORBA_IDLType type,
-+    ModuleDef create_module (
-+        in RepositoryId id,
-+        in Identifier name,
-+        in VersionSpec version
+-    ConstantDef create_constant (
+-        in RepositoryId id,
+-        in Identifier name,
+-        in VersionSpec version,
+-        in IDLType type,
++    CORBA_ModuleDef create_module (
++        in string id,
++        in string name,
++        in string version
 +      );
-+    ConstantDef create_constant (
-+        in RepositoryId id,
-+        in Identifier name,
-+        in VersionSpec version,
-+        in IDLType type,
++    CORBA_ConstantDef create_constant (
++        in string id,
++        in string name,
++        in string version,
++        in CORBA_IDLType type,
          in any value
        );
--    CORBA_StructDef create_struct (
--        in string id,
--        in string name,
--        in string version,
--        in CORBA_StructMemberSeq members
+-    StructDef create_struct (
+-        in RepositoryId id,
+-        in Identifier name,
+-        in VersionSpec version,
+-        in StructMemberSeq members
 -      );
--    CORBA_UnionDef create_union (
--        in string id,
--        in string name,
--        in string version,
--        in CORBA_IDLType discriminator_type,
--        in CORBA_UnionMemberSeq members
+-    UnionDef create_union (
+-        in RepositoryId id,
+-        in Identifier name,
+-        in VersionSpec version,
+-        in IDLType discriminator_type,
+-        in UnionMemberSeq members
 -      );
--    CORBA_EnumDef create_enum (
--        in string id,
--        in string name,
--        in string version,
--        in CORBA_EnumMemberSeq members
+-    EnumDef create_enum (
+-        in RepositoryId id,
+-        in Identifier name,
+-        in VersionSpec version,
+-        in EnumMemberSeq members
 -      );
--    CORBA_AliasDef create_alias (
--        in string id,
--        in string name,
--        in string version,
--        in CORBA_IDLType original_type
+-    AliasDef create_alias (
+-        in RepositoryId id,
+-        in Identifier name,
+-        in VersionSpec version,
+-        in IDLType original_type
 -      );
--    CORBA_InterfaceDef create_interface (
--        in string id,
--        in string name,
--        in string version,
--        in CORBA_InterfaceDefSeq base_interfaces
+-    InterfaceDef create_interface (
+-        in RepositoryId id,
+-        in Identifier name,
+-        in VersionSpec version,
+-        in InterfaceDefSeq base_interfaces
 -      );
--    CORBA_ValueDef create_value(
--        in string id,
--        in string name,
--        in string version,
-+    StructDef create_struct (
-+        in RepositoryId id,
-+        in Identifier name,
-+        in VersionSpec version,
-+        in StructMemberSeq members
+-    ValueDef create_value(
+-        in RepositoryId id,
+-        in Identifier name,
+-        in VersionSpec version,
++    CORBA_StructDef create_struct (
++        in string id,
++        in string name,
++        in string version,
++        in CORBA_StructMemberSeq members
 +      );
-+    UnionDef create_union (
-+        in RepositoryId id,
-+        in Identifier name,
-+        in VersionSpec version,
-+        in IDLType discriminator_type,
-+        in UnionMemberSeq members
++    CORBA_UnionDef create_union (
++        in string id,
++        in string name,
++        in string version,
++        in CORBA_IDLType discriminator_type,
++        in CORBA_UnionMemberSeq members
 +      );
-+    EnumDef create_enum (
-+        in RepositoryId id,
-+        in Identifier name,
-+        in VersionSpec version,
-+        in EnumMemberSeq members
++    CORBA_EnumDef create_enum (
++        in string id,
++        in string name,
++        in string version,
++        in CORBA_EnumMemberSeq members
 +      );
-+    AliasDef create_alias (
-+        in RepositoryId id,
-+        in Identifier name,
-+        in VersionSpec version,
-+        in IDLType original_type
++    CORBA_AliasDef create_alias (
++        in string id,
++        in string name,
++        in string version,
++        in CORBA_IDLType original_type
 +      );
-+    InterfaceDef create_interface (
-+        in RepositoryId id,
-+        in Identifier name,
-+        in VersionSpec version,
-+        in InterfaceDefSeq base_interfaces
++    CORBA_InterfaceDef create_interface (
++        in string id,
++        in string name,
++        in string version,
++        in CORBA_InterfaceDefSeq base_interfaces
 +      );
-+    ValueDef create_value(
-+        in RepositoryId id,
-+        in Identifier name,
-+        in VersionSpec version,
++    CORBA_ValueDef create_value(
++        in string id,
++        in string name,
++        in string version,
          in boolean is_custom,
          in boolean is_abstract,
--        in CORBA_ValueDef base_value,
-+        in ValueDef base_value,
+-        in ValueDef base_value,
++        in CORBA_ValueDef base_value,
          in boolean is_truncatable,
--        in CORBA_ValueDefSeq abstract_base_values,
--        in CORBA_InterfaceDefSeq supported_interfaces,
--        in CORBA_InitializerSeq initializers
-+        in ValueDefSeq abstract_base_values,
-+        in InterfaceDefSeq supported_interfaces,
-+        in InitializerSeq initializers
-       );
--    CORBA_ValueBoxDef create_value_box(
--        in string id,
--        in string name,
--        in string version,
--        in CORBA_IDLType original_type_def
-+    ValueBoxDef create_value_box(
-+        in RepositoryId id,
-+        in Identifier name,
-+        in VersionSpec version,
-+        in IDLType original_type_def
-       );
--    CORBA_ExceptionDef create_exception(
--        in string id,
--        in string name,
--        in string version,
--        in CORBA_StructMemberSeq members
-+    ExceptionDef create_exception(
-+        in RepositoryId id,
-+        in Identifier name,
-+        in VersionSpec version,
-+        in StructMemberSeq members
-       );
--    CORBA_NativeDef create_native(
--        in string id,
--        in string name,
--        in string version
-+    NativeDef create_native(
-+        in RepositoryId id,
-+        in Identifier name,
-+        in VersionSpec version
-       );
--    CORBA_AbstractInterfaceDef create_abstract_interface (
--        in string id,
--        in string name,
--        in string version,
--        in CORBA_AbstractInterfaceDefSeq base_interfaces
-+    AbstractInterfaceDef create_abstract_interface (
-+        in RepositoryId id,
-+        in Identifier name,
-+        in VersionSpec version,
-+        in AbstractInterfaceDefSeq base_interfaces
-       );
--    CORBA_LocalInterfaceDef create_local_interface (
--        in string id,
--        in string name,
--        in string version,
--        in CORBA_InterfaceDefSeq base_interfaces
-+    LocalInterfaceDef create_local_interface (
-+        in RepositoryId id,
-+        in Identifier name,
-+        in VersionSpec version,
-+        in InterfaceDefSeq base_interfaces
+-        in ValueDefSeq abstract_base_values,
+-        in InterfaceDefSeq supported_interfaces,
+-        in InitializerSeq initializers
+-      );
+-    ValueBoxDef create_value_box(
+-        in RepositoryId id,
+-        in Identifier name,
+-        in VersionSpec version,
+-        in IDLType original_type_def
+-      );
+-    ExceptionDef create_exception(
+-        in RepositoryId id,
+-        in Identifier name,
+-        in VersionSpec version,
+-        in StructMemberSeq members
+-      );
+-    NativeDef create_native(
+-        in RepositoryId id,
+-        in Identifier name,
+-        in VersionSpec version
+-      );
+-    AbstractInterfaceDef create_abstract_interface (
+-        in RepositoryId id,
+-        in Identifier name,
+-        in VersionSpec version,
+-        in AbstractInterfaceDefSeq base_interfaces
+-      );
+-    LocalInterfaceDef create_local_interface (
+-        in RepositoryId id,
+-        in Identifier name,
+-        in VersionSpec version,
+-        in InterfaceDefSeq base_interfaces
++        in CORBA_ValueDefSeq abstract_base_values,
++        in CORBA_InterfaceDefSeq supported_interfaces,
++        in CORBA_InitializerSeq initializers
++      );
++    CORBA_ValueBoxDef create_value_box(
++        in string id,
++        in string name,
++        in string version,
++        in CORBA_IDLType original_type_def
++      );
++    CORBA_ExceptionDef create_exception(
++        in string id,
++        in string name,
++        in string version,
++        in CORBA_StructMemberSeq members
++      );
++    CORBA_NativeDef create_native(
++        in string id,
++        in string name,
++        in string version
++      );
++    CORBA_AbstractInterfaceDef create_abstract_interface (
++        in string id,
++        in string name,
++        in string version,
++        in CORBA_AbstractInterfaceDefSeq base_interfaces
++      );
++    CORBA_LocalInterfaceDef create_local_interface (
++        in string id,
++        in string name,
++        in string version,
++        in CORBA_InterfaceDefSeq base_interfaces
        );
    };
  
--  interface CORBA_IDLType : CORBA_IRObject 
-+  interface IDLType : IRObject 
+-  interface IDLType : IRObject 
++  interface CORBA_IDLType : CORBA_IRObject 
    {
--    readonly attribute CORBA::TypeCode type;
-+    readonly attribute TypeCode type;
+-    readonly attribute TypeCode type;
++    readonly attribute CORBA::TypeCode type;
    };
  
--  interface CORBA_TypedefDef : CORBA_Contained, CORBA_IDLType 
-+  interface TypedefDef : Contained, IDLType 
+-  interface TypedefDef : Contained, IDLType 
++  interface CORBA_TypedefDef : CORBA_Contained, CORBA_IDLType 
    {
    };
  
--  struct CORBA_TypeDescription 
-+  struct TypeDescription 
+-  struct TypeDescription 
++  struct CORBA_TypeDescription 
    {
--    string name;
--    string id;
--    string defined_in;
--    string version;
--    CORBA::TypeCode type;
-+    Identifier name;
-+    RepositoryId id;
-+    RepositoryId defined_in;
-+    VersionSpec version;
-+    TypeCode type;
-+  };
+-    Identifier name;
+-    RepositoryId id;
+-    RepositoryId defined_in;
+-    VersionSpec version;
+-    TypeCode type;
++    string name;
++    string id;
++    string defined_in;
++    string version;
++    CORBA::TypeCode type;
    };
+-};
++
  
  #pragma prefix ""
+ 
diff --git a/TAO/tao/IFR_Client/diffs/IFR_Basic.pidl.diff b/TAO/tao/IFR_Client/diffs/IFR_Basic.pidl.diff
index e230cf75219..576834ebd4d 100644
--- a/TAO/tao/IFR_Client/diffs/IFR_Basic.pidl.diff
+++ b/TAO/tao/IFR_Client/diffs/IFR_Basic.pidl.diff
@@ -1,453 +1,448 @@
---- orig/IFR_Basic.pidl	Mon Apr 23 20:54:29 2001
-+++ IFR_Basic.pidl	Thu Apr 19 15:41:50 2001
-@@ -71,6 +71,13 @@
+--- IFR_Basic.pidl.old	Fri Jun  1 22:48:20 2001
++++ IFR_Basic.pidl	Fri Jun  1 22:43:58 2001
+@@ -71,13 +71,6 @@
  
- module CORBA
+ module CORBA 
  {
-+  interface PrimitiveDef;
-+  interface StringDef;
-+  interface SequenceDef;
-+  interface ArrayDef;
-+  interface WstringDef;
-+  interface FixedDef;
-+
+-  interface PrimitiveDef;
+-  interface StringDef;
+-  interface SequenceDef;
+-  interface ArrayDef;
+-  interface WstringDef;
+-  interface FixedDef;
+-
    enum PrimitiveKind 
    {
      pk_null, 
-@@ -97,282 +104,276 @@
+@@ -104,276 +97,277 @@
      pk_value_base
    };
  
--  enum AttributeMode 
--  {
--    ATTR_NORMAL, 
--    ATTR_READONLY
--  };
--
--  enum OperationMode 
--  {
--    OP_NORMAL, 
--    OP_ONEWAY
--  };
--
--  enum ParameterMode 
--  {
--    PARAM_IN, 
--    PARAM_OUT, 
--    PARAM_INOUT
--  };
--};
--
--  interface CORBA_PrimitiveDef;
--  interface CORBA_StringDef;
--  interface CORBA_SequenceDef;
--  interface CORBA_ArrayDef;
--  interface CORBA_WstringDef;
--  interface CORBA_FixedDef;
--
--  interface CORBA_Repository : CORBA_Container 
-+  interface Repository : Container 
+-  interface Repository : Container 
++  enum AttributeMode 
++  {
++    ATTR_NORMAL, 
++    ATTR_READONLY
++  };
++
++  enum OperationMode 
++  {
++    OP_NORMAL, 
++    OP_ONEWAY
++  };
++};
++
++  interface CORBA_PrimitiveDef;
++  interface CORBA_StringDef;
++  interface CORBA_SequenceDef;
++  interface CORBA_ArrayDef;
++  interface CORBA_WstringDef;
++  interface CORBA_FixedDef;
++
++  interface CORBA_Repository : CORBA_Container 
    {
      // read interface
--    CORBA_Contained lookup_id (
--        in string search_id
-+    Contained lookup_id (
-+        in RepositoryId search_id
+-    Contained lookup_id (
+-        in RepositoryId search_id
++    CORBA_Contained lookup_id (
++        in string search_id
        );
--    CORBA::TypeCode get_canonical_typecode (
--        in CORBA::TypeCode tc
-+    TypeCode get_canonical_typecode (
-+        in TypeCode tc
+-    TypeCode get_canonical_typecode (
+-        in TypeCode tc
++    CORBA::TypeCode get_canonical_typecode (
++        in CORBA::TypeCode tc
        );
--    CORBA_PrimitiveDef get_primitive (
--        in CORBA::PrimitiveKind kind
-+    PrimitiveDef get_primitive (
-+        in PrimitiveKind kind
+-    PrimitiveDef get_primitive (
+-        in PrimitiveKind kind
++    CORBA_PrimitiveDef get_primitive (
++        in CORBA::PrimitiveKind kind
        );
      // write interface
--    CORBA_StringDef create_string (
-+    StringDef create_string (
+-    StringDef create_string (
++    CORBA_StringDef create_string (
          in unsigned long bound
        );
--    CORBA_WstringDef create_wstring (
-+    WstringDef create_wstring (
+-    WstringDef create_wstring (
++    CORBA_WstringDef create_wstring (
          in unsigned long bound
        );
--    CORBA_SequenceDef create_sequence (
-+    SequenceDef create_sequence (
+-    SequenceDef create_sequence (
++    CORBA_SequenceDef create_sequence (
          in unsigned long bound,
--        in CORBA_IDLType element_type
-+        in IDLType element_type
+-        in IDLType element_type
++        in CORBA_IDLType element_type
        );
--    CORBA_ArrayDef create_array (
-+    ArrayDef create_array (
+-    ArrayDef create_array (
++    CORBA_ArrayDef create_array (
          in unsigned long length,
--        in CORBA_IDLType element_type
-+        in IDLType element_type
+-        in IDLType element_type
++        in CORBA_IDLType element_type
        );
--    CORBA_FixedDef create_fixed (
-+    FixedDef create_fixed (
+-    FixedDef create_fixed (
++    CORBA_FixedDef create_fixed (
          in unsigned short digits,
          in short scale
        );
    };
  
--  interface CORBA_ModuleDef : CORBA_Container, CORBA_Contained 
-+  interface ModuleDef : Container, Contained 
+-  interface ModuleDef : Container, Contained 
++  interface CORBA_ModuleDef : CORBA_Container, CORBA_Contained 
    {
    };
  
--  struct CORBA_ModuleDescription 
-+  struct ModuleDescription 
+-  struct ModuleDescription 
++  struct CORBA_ModuleDescription 
    {
--    string name;
--    string id;
--    string defined_in;
--    string version;
-+    Identifier name;
-+    RepositoryId id;
-+    RepositoryId defined_in;
-+    VersionSpec version;
+-    Identifier name;
+-    RepositoryId id;
+-    RepositoryId defined_in;
+-    VersionSpec version;
++    string name;
++    string id;
++    string defined_in;
++    string version;
    };
  
--  interface CORBA_ConstantDef : CORBA_Contained 
-+  interface ConstantDef : Contained 
+-  interface ConstantDef : Contained 
++  interface CORBA_ConstantDef : CORBA_Contained 
    {
--    readonly attribute CORBA::TypeCode type;
--    attribute CORBA_IDLType type_def;
-+    readonly attribute TypeCode type;
-+    attribute IDLType type_def;
+-    readonly attribute TypeCode type;
+-    attribute IDLType type_def;
++    readonly attribute CORBA::TypeCode type;
++    attribute CORBA_IDLType type_def;
      attribute any value;
    };
  
--  struct CORBA_ConstantDescription 
-+  struct ConstantDescription 
+-  struct ConstantDescription 
++  struct CORBA_ConstantDescription 
    {
--    string name;
--    string id;
--    string defined_in;
--    string version;
--    CORBA::TypeCode type;
-+    Identifier name;
-+    RepositoryId id;
-+    RepositoryId defined_in;
-+    VersionSpec version;
-+    TypeCode type;
+-    Identifier name;
+-    RepositoryId id;
+-    RepositoryId defined_in;
+-    VersionSpec version;
+-    TypeCode type;
++    string name;
++    string id;
++    string defined_in;
++    string version;
++    CORBA::TypeCode type;
      any value;
    };
  
--  interface CORBA_StructDef : CORBA_TypedefDef, CORBA_Container 
-+  interface StructDef : TypedefDef, Container 
+-  interface StructDef : TypedefDef, Container 
++  interface CORBA_StructDef : CORBA_TypedefDef, CORBA_Container 
    {
--    attribute CORBA_StructMemberSeq members;
-+    attribute StructMemberSeq members;
+-    attribute StructMemberSeq members;
++    attribute CORBA_StructMemberSeq members;
    };
  
--  interface CORBA_UnionDef : CORBA_TypedefDef, CORBA_Container 
-+  interface UnionDef : TypedefDef, Container 
+-  interface UnionDef : TypedefDef, Container 
++  interface CORBA_UnionDef : CORBA_TypedefDef, CORBA_Container 
    {
--    readonly attribute CORBA::TypeCode discriminator_type;
--    attribute CORBA_IDLType discriminator_type_def;
--    attribute CORBA_UnionMemberSeq members;
-+    readonly attribute TypeCode discriminator_type;
-+    attribute IDLType discriminator_type_def;
-+    attribute UnionMemberSeq members;
+-    readonly attribute TypeCode discriminator_type;
+-    attribute IDLType discriminator_type_def;
+-    attribute UnionMemberSeq members;
++    readonly attribute CORBA::TypeCode discriminator_type;
++    attribute CORBA_IDLType discriminator_type_def;
++    attribute CORBA_UnionMemberSeq members;
    };
  
--  interface CORBA_EnumDef : CORBA_TypedefDef 
-+  interface EnumDef : TypedefDef 
+-  interface EnumDef : TypedefDef 
++  interface CORBA_EnumDef : CORBA_TypedefDef 
    {
--    attribute CORBA_EnumMemberSeq members;
-+    attribute EnumMemberSeq members;
+-    attribute EnumMemberSeq members;
++    attribute CORBA_EnumMemberSeq members;
    };
  
--  interface CORBA_AliasDef : CORBA_TypedefDef 
-+  interface AliasDef : TypedefDef 
+-  interface AliasDef : TypedefDef 
++  interface CORBA_AliasDef : CORBA_TypedefDef 
    {
--    attribute CORBA_IDLType original_type_def;
-+    attribute IDLType original_type_def;
+-    attribute IDLType original_type_def;
++    attribute CORBA_IDLType original_type_def;
    };
  
--  interface CORBA_NativeDef : CORBA_TypedefDef 
-+  interface NativeDef : TypedefDef 
+-  interface NativeDef : TypedefDef 
++  interface CORBA_NativeDef : CORBA_TypedefDef 
    {
    };
  
--  interface CORBA_PrimitiveDef: CORBA_IDLType 
-+  interface PrimitiveDef: IDLType 
+-  interface PrimitiveDef: IDLType 
++  interface CORBA_PrimitiveDef: CORBA_IDLType 
    {
--    readonly attribute CORBA::PrimitiveKind kind;
-+    readonly attribute PrimitiveKind kind;
+-    readonly attribute PrimitiveKind kind;
++    readonly attribute CORBA::PrimitiveKind kind;
    };
  
--  interface CORBA_StringDef : CORBA_IDLType 
-+  interface StringDef : IDLType 
+-  interface StringDef : IDLType 
++  interface CORBA_StringDef : CORBA_IDLType 
    {
      attribute unsigned long bound;
    };
  
--  interface CORBA_WstringDef : CORBA_IDLType 
-+  interface WstringDef : IDLType 
+-  interface WstringDef : IDLType 
++  interface CORBA_WstringDef : CORBA_IDLType 
    {
      attribute unsigned long bound;
    };
  
--  interface CORBA_SequenceDef : CORBA_IDLType 
-+  interface SequenceDef : IDLType 
+-  interface SequenceDef : IDLType 
++  interface CORBA_SequenceDef : CORBA_IDLType 
    {
      attribute unsigned long bound;
--    readonly attribute CORBA::TypeCode element_type;
--    attribute CORBA_IDLType element_type_def;
-+    readonly attribute TypeCode element_type;
-+    attribute IDLType element_type_def;
+-    readonly attribute TypeCode element_type;
+-    attribute IDLType element_type_def;
++    readonly attribute CORBA::TypeCode element_type;
++    attribute CORBA_IDLType element_type_def;
    };
  
--  interface CORBA_ArrayDef : CORBA_IDLType 
-+  interface ArrayDef : IDLType 
+-  interface ArrayDef : IDLType 
++  interface CORBA_ArrayDef : CORBA_IDLType 
    {
-     attribute unsigned long length;
--    readonly attribute CORBA::TypeCode element_type;
--    attribute CORBA_IDLType element_type_def;
-+  readonly attribute TypeCode element_type;
-+  attribute IDLType element_type_def;
+   attribute unsigned long length;
+-  readonly attribute TypeCode element_type;
+-  attribute IDLType element_type_def;
+-  };
+-
+-  interface ExceptionDef : Contained, Container 
+-  {
+-    readonly attribute TypeCode type;
+-    attribute StructMemberSeq members;
+-  };
+-
+-  struct ExceptionDescription 
+-  {
+-    Identifier name;
+-    RepositoryId id;
+-    RepositoryId defined_in;
+-    VersionSpec version;
+-    TypeCode type;
++  readonly attribute CORBA::TypeCode element_type;
++  attribute CORBA_IDLType element_type_def;
    };
  
--  interface CORBA_ExceptionDef : CORBA_Contained, CORBA_Container 
-+  interface ExceptionDef : Contained, Container 
+-  typedef sequence <ExceptionDef> ExceptionDefSeq;
+-  typedef sequence <ExceptionDescription> ExcDescriptionSeq;
+-
+-  enum AttributeMode 
++  interface CORBA_ExceptionDef : CORBA_Contained, CORBA_Container 
    {
--    readonly attribute CORBA::TypeCode type;
--    attribute CORBA_StructMemberSeq members;
-+    readonly attribute TypeCode type;
-+    attribute StructMemberSeq members;
+-    ATTR_NORMAL, 
+-    ATTR_READONLY
++    readonly attribute CORBA::TypeCode type;
++    attribute CORBA_StructMemberSeq members;
    };
  
--  struct CORBA_ExceptionDescription 
-+  struct ExceptionDescription 
+-  interface AttributeDef : Contained 
++  struct CORBA_ExceptionDescription 
    {
--    string name;
--    string id;
--    string defined_in;
--    string version;
--    CORBA::TypeCode type;
-+    Identifier name;
-+    RepositoryId id;
-+    RepositoryId defined_in;
-+    VersionSpec version;
-+    TypeCode type;
+-    readonly attribute TypeCode type;
+-    attribute IDLType type_def;
+-    attribute AttributeMode mode;
++    string name;
++    string id;
++    string defined_in;
++    string version;
++    CORBA::TypeCode type;
    };
  
--  typedef sequence <CORBA_ExceptionDef> CORBA_ExceptionDefSeq;
--  typedef sequence <CORBA_ExceptionDescription> CORBA_ExcDescriptionSeq;
-+  typedef sequence <ExceptionDef> ExceptionDefSeq;
-+  typedef sequence <ExceptionDescription> ExcDescriptionSeq;
+-  struct AttributeDescription 
+-  {
+-    Identifier name;
+-    RepositoryId id;
+-    RepositoryId defined_in;
+-    VersionSpec version;
+-    TypeCode type;
+-    AttributeMode mode;
+-  };
++  typedef sequence <CORBA_ExceptionDef> CORBA_ExceptionDefSeq;
++  typedef sequence <CORBA_ExceptionDescription> CORBA_ExcDescriptionSeq;
  
--  interface CORBA_AttributeDef : CORBA_Contained 
-+  enum AttributeMode 
+-  enum OperationMode 
++  interface CORBA_AttributeDef : CORBA_Contained 
    {
--    readonly attribute CORBA::TypeCode type;
--    attribute CORBA_IDLType type_def;
--    attribute CORBA::AttributeMode mode;
-+    ATTR_NORMAL, 
-+    ATTR_READONLY
+-    OP_NORMAL, 
+-    OP_ONEWAY
++    readonly attribute CORBA::TypeCode type;
++    attribute CORBA_IDLType type_def;
++    attribute CORBA::AttributeMode mode;
    };
  
--  struct CORBA_AttributeDescription 
-+  interface AttributeDef : Contained 
+-  enum ParameterMode 
++  struct CORBA_AttributeDescription 
    {
--    string name;
--    string id;
--    string defined_in;
--    string version;
--    CORBA::TypeCode type;
--    CORBA::AttributeMode mode;
-+    readonly attribute TypeCode type;
-+    attribute IDLType type_def;
-+    attribute AttributeMode mode;
+-    PARAM_IN, 
+-    PARAM_OUT, 
+-    PARAM_INOUT
++    string name;
++    string id;
++    string defined_in;
++    string version;
++    CORBA::TypeCode type;
++    CORBA::AttributeMode mode;
    };
  
--  struct CORBA_ParameterDescription 
-+  struct AttributeDescription 
+-  struct ParameterDescription 
++  struct CORBA_ParameterDescription 
    {
--    string name;
--    CORBA::TypeCode type;
--    CORBA_IDLType type_def;
--    CORBA::ParameterMode mode;
-+    Identifier name;
-+    RepositoryId id;
-+    RepositoryId defined_in;
-+    VersionSpec version;
-+    TypeCode type;
-+    AttributeMode mode;
+-    Identifier name;
+-    TypeCode type;
+-    IDLType type_def;
+-    ParameterMode mode;
++    string name;
++    CORBA::TypeCode type;
++    CORBA_IDLType type_def;
++    CORBA::ParameterMode mode;
    };
  
--  typedef sequence <CORBA_ParameterDescription> CORBA_ParDescriptionSeq;
--  typedef sequence <string> CORBA_ContextIdSeq;
-+  enum OperationMode 
-+  {
-+    OP_NORMAL, 
-+    OP_ONEWAY
-+  };
+-  typedef sequence <ParameterDescription> ParDescriptionSeq;
+-  typedef Identifier ContextIdentifier;
+-  typedef sequence <ContextIdentifier> ContextIdSeq;
++  typedef sequence <CORBA_ParameterDescription> CORBA_ParDescriptionSeq;
++  typedef string CORBA_Contextstring;
++  typedef sequence <CORBA_Contextstring> CORBA_ContextIdSeq;
  
--  interface CORBA_OperationDef : CORBA_Contained 
-+  enum ParameterMode 
+-  interface OperationDef : Contained 
++  interface CORBA_OperationDef : CORBA_Contained 
    {
--    readonly attribute CORBA::TypeCode result;
--    attribute CORBA_IDLType result_def;
--    attribute CORBA_ParDescriptionSeq params;
--    attribute CORBA::OperationMode mode;
--    attribute CORBA_ContextIdSeq contexts;
--    attribute CORBA_ExceptionDefSeq exceptions;
-+    PARAM_IN, 
-+    PARAM_OUT, 
-+    PARAM_INOUT
-+  };
-+
-+  struct ParameterDescription 
-+  {
-+    Identifier name;
-+    TypeCode type;
-+    IDLType type_def;
-+    ParameterMode mode;
+-    readonly attribute TypeCode result;
+-    attribute IDLType result_def;
+-    attribute ParDescriptionSeq params;
+-    attribute OperationMode mode;
+-    attribute ContextIdSeq contexts;
+-    attribute ExceptionDefSeq exceptions;
++    readonly attribute CORBA::TypeCode result;
++    attribute CORBA_IDLType result_def;
++    attribute CORBA_ParDescriptionSeq params;
++    attribute CORBA::OperationMode mode;
++    attribute CORBA_ContextIdSeq contexts;
++    attribute CORBA_ExceptionDefSeq exceptions;
    };
  
--  struct CORBA_OperationDescription 
-+  typedef sequence <ParameterDescription> ParDescriptionSeq;
-+  typedef Identifier ContextIdentifier;
-+  typedef sequence <ContextIdentifier> ContextIdSeq;
-+
-+  interface OperationDef : Contained 
+-  struct OperationDescription 
++  struct CORBA_OperationDescription 
    {
--    string name;
--    string id;
--    string defined_in;
--    string version;
--    CORBA::TypeCode result;
--    CORBA::OperationMode mode;
--    CORBA_ContextIdSeq contexts;
--    CORBA_ParDescriptionSeq parameters;
--    CORBA_ExcDescriptionSeq exceptions;
-+    readonly attribute TypeCode result;
-+    attribute IDLType result_def;
-+    attribute ParDescriptionSeq params;
-+    attribute OperationMode mode;
-+    attribute ContextIdSeq contexts;
-+    attribute ExceptionDefSeq exceptions;
+-    Identifier name;
+-    RepositoryId id;
+-    RepositoryId defined_in;
+-    VersionSpec version;
+-    TypeCode result;
+-    OperationMode mode;
+-    ContextIdSeq contexts;
+-    ParDescriptionSeq parameters;
+-    ExcDescriptionSeq exceptions;
++    string name;
++    string id;
++    string defined_in;
++    string version;
++    CORBA::TypeCode result;
++    CORBA::OperationMode mode;
++    CORBA_ContextIdSeq contexts;
++    CORBA_ParDescriptionSeq parameters;
++    CORBA_ExcDescriptionSeq exceptions;
    };
  
--  typedef sequence <string> CORBA_RepositoryIdSeq;
--  typedef sequence <CORBA_OperationDescription> CORBA_OpDescriptionSeq;
--  typedef sequence <CORBA_AttributeDescription> CORBA_AttrDescriptionSeq;
-+  struct OperationDescription 
-+  {
-+    Identifier name;
-+    RepositoryId id;
-+    RepositoryId defined_in;
-+    VersionSpec version;
-+    TypeCode result;
-+    OperationMode mode;
-+    ContextIdSeq contexts;
-+    ParDescriptionSeq parameters;
-+    ExcDescriptionSeq exceptions;
-+  };
+-  typedef sequence <RepositoryId> RepositoryIdSeq;
+-  typedef sequence <OperationDescription> OpDescriptionSeq;
+-  typedef sequence <AttributeDescription> AttrDescriptionSeq;
++  typedef sequence <string> CORBA_RepositoryIdSeq;
++  typedef sequence <CORBA_OperationDescription> CORBA_OpDescriptionSeq;
++  typedef sequence <CORBA_AttributeDescription> CORBA_AttrDescriptionSeq;
  
--  interface CORBA_InterfaceDef : CORBA_Container, CORBA_Contained, CORBA_IDLType 
-+  typedef sequence <RepositoryId> RepositoryIdSeq;
-+  typedef sequence <OperationDescription> OpDescriptionSeq;
-+  typedef sequence <AttributeDescription> AttrDescriptionSeq;
-+
-+  interface InterfaceDef : Container, Contained, IDLType 
+-  interface InterfaceDef : Container, Contained, IDLType 
++  interface CORBA_InterfaceDef : CORBA_Container, CORBA_Contained, CORBA_IDLType 
    {
      // read/write interface
--    attribute CORBA_InterfaceDefSeq base_interfaces;
-+    attribute InterfaceDefSeq base_interfaces;
+-    attribute InterfaceDefSeq base_interfaces;
++    attribute CORBA_InterfaceDefSeq base_interfaces;
      // read interface
      boolean is_a (
--        in string interface_id
-+        in RepositoryId interface_id
+-        in RepositoryId interface_id
++        in string interface_id
        );
  
      struct FullInterfaceDescription 
      {
--      string name;
--      string id;
--      string defined_in;
--      string version;
--      CORBA_OpDescriptionSeq operations;
--      CORBA_AttrDescriptionSeq attributes;
--      CORBA_RepositoryIdSeq base_interfaces;
--      CORBA::TypeCode type;
-+      Identifier name;
-+      RepositoryId id;
-+      RepositoryId defined_in;
-+      VersionSpec version;
-+      OpDescriptionSeq operations;
-+      AttrDescriptionSeq attributes;
-+      RepositoryIdSeq base_interfaces;
-+      TypeCode type;
+-      Identifier name;
+-      RepositoryId id;
+-      RepositoryId defined_in;
+-      VersionSpec version;
+-      OpDescriptionSeq operations;
+-      AttrDescriptionSeq attributes;
+-      RepositoryIdSeq base_interfaces;
+-      TypeCode type;
++      string name;
++      string id;
++      string defined_in;
++      string version;
++      CORBA_OpDescriptionSeq operations;
++      CORBA_AttrDescriptionSeq attributes;
++      CORBA_RepositoryIdSeq base_interfaces;
++      CORBA::TypeCode type;
      };
  
      FullInterfaceDescription describe_interface ();
  
      // write interface
--    CORBA_AttributeDef create_attribute (
--        in string id,
--        in string name,
--        in string version,
--        in CORBA_IDLType type,
--        in CORBA::AttributeMode mode
-+    AttributeDef create_attribute (
-+        in RepositoryId id,
-+        in Identifier name,
-+        in VersionSpec version,
-+        in IDLType type,
-+        in AttributeMode mode
+-    AttributeDef create_attribute (
+-        in RepositoryId id,
+-        in Identifier name,
+-        in VersionSpec version,
+-        in IDLType type,
+-        in AttributeMode mode
++    CORBA_AttributeDef create_attribute (
++        in string id,
++        in string name,
++        in string version,
++        in CORBA_IDLType type,
++        in CORBA::AttributeMode mode
        );
--    CORBA_OperationDef create_operation (
--        in string id,
--        in string name,
--        in string version,
--        in CORBA_IDLType result,
--        in CORBA::OperationMode mode,
--        in CORBA_ParDescriptionSeq params,
--        in CORBA_ExceptionDefSeq exceptions,
--        in CORBA_ContextIdSeq contexts
-+    OperationDef create_operation (
-+        in RepositoryId id,
-+        in Identifier name,
-+        in VersionSpec version,
-+        in IDLType result,
-+        in OperationMode mode,
-+        in ParDescriptionSeq params,
-+        in ExceptionDefSeq exceptions,
-+        in ContextIdSeq contexts
+-    OperationDef create_operation (
+-        in RepositoryId id,
+-        in Identifier name,
+-        in VersionSpec version,
+-        in IDLType result,
+-        in OperationMode mode,
+-        in ParDescriptionSeq params,
+-        in ExceptionDefSeq exceptions,
+-        in ContextIdSeq contexts
++    CORBA_OperationDef create_operation (
++        in string id,
++        in string name,
++        in string version,
++        in CORBA_IDLType result,
++        in CORBA::OperationMode mode,
++        in CORBA_ParDescriptionSeq params,
++        in CORBA_ExceptionDefSeq exceptions,
++        in CORBA_ContextIdSeq contexts
        );
    };
  
--  struct CORBA_InterfaceDescription 
-+  struct InterfaceDescription 
+-  struct InterfaceDescription 
++  struct CORBA_InterfaceDescription 
    {
--    string name;
--    string id;
--    string defined_in;
--    string version;
--    CORBA_RepositoryIdSeq base_interfaces;
-+    Identifier name;
-+    RepositoryId id;
-+    RepositoryId defined_in;
-+    VersionSpec version;
-+    RepositoryIdSeq base_interfaces;
+-    Identifier name;
+-    RepositoryId id;
+-    RepositoryId defined_in;
+-    VersionSpec version;
+-    RepositoryIdSeq base_interfaces;
++    string name;
++    string id;
++    string defined_in;
++    string version;
++    CORBA_RepositoryIdSeq base_interfaces;
    };
  
--  interface CORBA_AbstractInterfaceDef : CORBA_InterfaceDef 
-+  interface AbstractInterfaceDef : InterfaceDef 
+-  interface AbstractInterfaceDef : InterfaceDef 
++  interface CORBA_AbstractInterfaceDef : CORBA_InterfaceDef 
    {
    };
  
--  interface CORBA_LocalInterfaceDef : CORBA_InterfaceDef 
-+  interface LocalInterfaceDef : InterfaceDef 
+-  interface LocalInterfaceDef : InterfaceDef 
++  interface CORBA_LocalInterfaceDef : CORBA_InterfaceDef 
    {
    };
-+};
+-};
++
  
  #pragma prefix ""
  
diff --git a/TAO/tao/IFR_Client/diffs/IFR_Components.pidl.diff b/TAO/tao/IFR_Client/diffs/IFR_Components.pidl.diff
index 65dcf794b95..5668e0f9b93 100644
--- a/TAO/tao/IFR_Client/diffs/IFR_Components.pidl.diff
+++ b/TAO/tao/IFR_Client/diffs/IFR_Components.pidl.diff
@@ -1,264 +1,264 @@
---- orig/IFR_Components.pidl	Fri Apr 20 03:46:56 2001
-+++ IFR_Components.pidl	Fri Apr 20 03:39:21 2001
-@@ -71,6 +71,44 @@
+--- IFR_Components.pidl.old	Fri Jun  1 23:05:46 2001
++++ IFR_Components.pidl	Fri Jun  1 23:03:13 2001
+@@ -71,44 +71,6 @@
  
  module IR
  {
-+  enum DefinitionKind 
-+  {
-+    dk_none, 
-+    dk_all,
-+    dk_Attribute, 
-+    dk_Constant, 
-+    dk_Exception, 
-+    dk_Interface,
-+    dk_Module, 
-+    dk_Operation, 
-+    dk_Typedef,
-+    dk_Alias, 
-+    dk_Struct, 
-+    dk_Union, 
-+    dk_Enum,
-+    dk_Primitive, 
-+    dk_String, 
-+    dk_Sequence, 
-+    dk_Array,
-+    dk_Repository,
-+    dk_Wstring, 
-+    dk_Fixed,
-+    dk_Value, 
-+    dk_ValueBox, 
-+    dk_ValueMember,
-+    dk_Native,
-+    dk_Component,
-+    dk_Home,
-+    dk_Factory,
-+    dk_Finder,
-+    dk_PrimaryKey,
-+    dk_Emits,
-+    dk_Publishes,
-+    dk_Consumes,
-+    dk_Provides,
-+    dk_Uses
-+  };
-+
+-  enum DefinitionKind 
+-  {
+-    dk_none, 
+-    dk_all,
+-    dk_Attribute, 
+-    dk_Constant, 
+-    dk_Exception, 
+-    dk_Interface,
+-    dk_Module, 
+-    dk_Operation, 
+-    dk_Typedef,
+-    dk_Alias, 
+-    dk_Struct, 
+-    dk_Union, 
+-    dk_Enum,
+-    dk_Primitive, 
+-    dk_String, 
+-    dk_Sequence, 
+-    dk_Array,
+-    dk_Repository,
+-    dk_Wstring, 
+-    dk_Fixed,
+-    dk_Value, 
+-    dk_ValueBox, 
+-    dk_ValueMember,
+-    dk_Native,
+-    dk_Component,
+-    dk_Home,
+-    dk_Factory,
+-    dk_Finder,
+-    dk_PrimaryKey,
+-    dk_Emits,
+-    dk_Publishes,
+-    dk_Consumes,
+-    dk_Provides,
+-    dk_Uses
+-  };
+-
    typedef string Identifier;
    typedef string ScopedName;
    typedef string RepositoryId;
-@@ -98,14 +136,14 @@
+@@ -136,14 +98,14 @@
    typedef sequence <FinderDef> FinderDefSeq;
    interface PrimaryKeyDef;
  
--  interface ComponentRepository : CORBA_Repository
-+  interface ComponentRepository : CORBA::Repository
+-  interface ComponentRepository : CORBA::Repository
++  interface ComponentRepository : CORBA_Repository
    {
      ComponentDef create_component (
          in RepositoryId id,
          in Identifier name,
          in VersionSpec version,
          in ComponentDef base_component,
--        in CORBA_InterfaceDefSeq supports_interfaces
-+        in CORBA::InterfaceDefSeq supports_interfaces
+-        in CORBA::InterfaceDefSeq supports_interfaces
++        in CORBA_InterfaceDefSeq supports_interfaces
        );
      HomeDef create_home (
          in RepositoryId id,
-@@ -113,14 +151,14 @@
+@@ -151,14 +113,14 @@
          in VersionSpec version,
          in HomeDef base_home,
          in ComponentDef managed_component,
--        in CORBA_ValueDef primary_key
-+        in CORBA::ValueDef primary_key
+-        in CORBA::ValueDef primary_key
++        in CORBA_ValueDef primary_key
        );
    };
  
--  interface ProvidesDef : CORBA_Contained 
-+  interface ProvidesDef : CORBA::Contained 
+-  interface ProvidesDef : CORBA::Contained 
++  interface ProvidesDef : CORBA_Contained 
    {
      // read interface
--    readonly attribute CORBA_InterfaceDef interface_type;
-+    readonly attribute CORBA::InterfaceDef interface_type;
+-    readonly attribute CORBA::InterfaceDef interface_type;
++    readonly attribute CORBA_InterfaceDef interface_type;
    };
  
    struct ProvidesDescription 
-@@ -129,13 +167,13 @@
+@@ -167,13 +129,13 @@
      RepositoryId id;
      RepositoryId defined_in;
      VersionSpec version;
--    CORBA_InterfaceDef interface_type;
-+    CORBA::InterfaceDef interface_type;
+-    CORBA::InterfaceDef interface_type;
++    CORBA_InterfaceDef interface_type;
    };
  
--  interface UsesDef : CORBA_Contained 
-+  interface UsesDef : CORBA::Contained 
+-  interface UsesDef : CORBA::Contained 
++  interface UsesDef : CORBA_Contained 
    {
      // read interface
--    readonly attribute CORBA_InterfaceDef interface_type;
-+    readonly attribute CORBA::InterfaceDef interface_type;
+-    readonly attribute CORBA::InterfaceDef interface_type;
++    readonly attribute CORBA_InterfaceDef interface_type;
      readonly attribute boolean is_multiple;
    };
  
-@@ -145,18 +183,18 @@
+@@ -183,18 +145,18 @@
      RepositoryId id;
      RepositoryId defined_in;
      VersionSpec version;
--    CORBA_InterfaceDef interface_type;
-+    CORBA::InterfaceDef interface_type;
+-    CORBA::InterfaceDef interface_type;
++    CORBA_InterfaceDef interface_type;
      boolean is_multiple;
    };
  
    typedef sequence <ProvidesDescription> ProvidesDescSeq;
    typedef sequence <UsesDescription> UsesDescSeq;
  
--  interface EventDef : CORBA_Contained 
-+  interface EventDef : CORBA::Contained 
+-  interface EventDef : CORBA::Contained 
++  interface EventDef : CORBA_Contained 
    { // abstract - never instantiated
      // read interface
      boolean is_a (in RepositoryId event_id);
--    readonly attribute CORBA_ValueDef event;
-+    readonly attribute CORBA::ValueDef event;
+-    readonly attribute CORBA::ValueDef event;
++    readonly attribute CORBA_ValueDef event;
    };
  
    struct EventDescription 
-@@ -165,7 +203,7 @@
+@@ -203,7 +165,7 @@
      RepositoryId id;
      RepositoryId defined_in;
      VersionSpec version;
--    CORBA_ValueDef value;
-+    CORBA::ValueDef value;
+-    CORBA::ValueDef value;
++    CORBA_ValueDef value;
    };
  
    interface EmitsDef : EventDef 
-@@ -180,10 +218,10 @@
+@@ -218,10 +180,10 @@
    {
    };
  
--  interface ComponentDef : CORBA_InterfaceDef 
-+  interface ComponentDef : CORBA::InterfaceDef 
+-  interface ComponentDef : CORBA::InterfaceDef 
++  interface ComponentDef : CORBA_InterfaceDef 
    {
      // read/write interface
--    attribute CORBA_InterfaceDefSeq supported_interfaces;
-+    attribute CORBA::InterfaceDefSeq supported_interfaces;
+-    attribute CORBA::InterfaceDefSeq supported_interfaces;
++    attribute CORBA_InterfaceDefSeq supported_interfaces;
      // read interface
      readonly attribute ComponentDef base_component;
      readonly attribute ProvidesDefSeq provides_interfaces;
-@@ -197,32 +235,32 @@
+@@ -235,32 +197,32 @@
          in RepositoryId id,
          in Identifier name,
          in VersionSpec version,
--        in CORBA_InterfaceDef interface_type
-+        in CORBA::InterfaceDef interface_type
+-        in CORBA::InterfaceDef interface_type
++        in CORBA_InterfaceDef interface_type
        );
      UsesDef create_uses (
          in RepositoryId id,
          in Identifier name,
          in VersionSpec version,
--        in CORBA_InterfaceDef interface_type,
-+        in CORBA::InterfaceDef interface_type,
+-        in CORBA::InterfaceDef interface_type,
++        in CORBA_InterfaceDef interface_type,
          in boolean is_multiple
        );
      EmitsDef create_emits (
          in RepositoryId id,
          in Identifier name,
          in VersionSpec version,
--        in CORBA_ValueDef value
-+        in CORBA::ValueDef value
+-        in CORBA::ValueDef value
++        in CORBA_ValueDef value
        );
      PublishesDef create_publishes (
          in RepositoryId id,
          in Identifier name,
          in VersionSpec version,
--        in CORBA_ValueDef value
-+        in CORBA::ValueDef value
+-        in CORBA::ValueDef value
++        in CORBA_ValueDef value
        );
      ConsumesDef create_consumes (
          in RepositoryId id,
          in Identifier name,
          in VersionSpec version,
--        in CORBA_ValueDef value
-+        in CORBA::ValueDef value
+-        in CORBA::ValueDef value
++        in CORBA_ValueDef value
        );
    };
  
-@@ -236,18 +274,18 @@
+@@ -274,18 +236,18 @@
      RepositoryIdSeq supports_interfaces;
      ProvidesDefSeq provides_interfaces;
      UsesDefSeq uses_interfaces;
--    CORBA_AttrDescriptionSeq attributes;
-+    CORBA::AttrDescriptionSeq attributes;
+-    CORBA::AttrDescriptionSeq attributes;
++    CORBA_AttrDescriptionSeq attributes;
      EmitsDefSeq emits_events;
      PublishesDefSeq publishes_events;
      ConsumesDefSeq consumes_events;
      boolean is_basic;
    };
  
--  interface PrimaryKeyDef : CORBA_Contained 
-+  interface PrimaryKeyDef : CORBA::Contained 
+-  interface PrimaryKeyDef : CORBA::Contained 
++  interface PrimaryKeyDef : CORBA_Contained 
    {
      // read interface
      boolean is_a (in RepositoryId primary_key_id);
--    readonly attribute CORBA_ValueDef primary_key;
-+    readonly attribute CORBA::ValueDef primary_key;
+-    readonly attribute CORBA::ValueDef primary_key;
++    readonly attribute CORBA_ValueDef primary_key;
    };
  
    struct PrimaryKeyDescription 
-@@ -256,18 +294,18 @@
+@@ -294,18 +256,18 @@
      RepositoryId id;
      RepositoryId defined_in;
      VersionSpec version;
--    CORBA_ValueDef primary_key;
-+    CORBA::ValueDef primary_key;
+-    CORBA::ValueDef primary_key;
++    CORBA_ValueDef primary_key;
    };
  
--  interface FactoryDef : CORBA_OperationDef 
-+  interface FactoryDef : CORBA::OperationDef 
+-  interface FactoryDef : CORBA::OperationDef 
++  interface FactoryDef : CORBA_OperationDef 
    { // only PARAM_IN parameters
    };
  
--  interface FinderDef : CORBA_OperationDef 
-+  interface FinderDef : CORBA::OperationDef 
+-  interface FinderDef : CORBA::OperationDef 
++  interface FinderDef : CORBA_OperationDef 
    { // only PARAM_IN parameters
    };
  
--  interface HomeDef : CORBA_InterfaceDef 
-+  interface HomeDef : CORBA::InterfaceDef 
+-  interface HomeDef : CORBA::InterfaceDef 
++  interface HomeDef : CORBA_InterfaceDef 
    {
      // read operations
      readonly attribute HomeDef base_home;
-@@ -281,21 +319,21 @@
+@@ -319,21 +281,21 @@
          in RepositoryId id,
          in Identifier name,
          in VersionSpec version,
--        in CORBA_ValueDef primary_key
-+        in CORBA::ValueDef primary_key
+-        in CORBA::ValueDef primary_key
++        in CORBA_ValueDef primary_key
        );
      FactoryDef create_factory (
          in RepositoryId id,
          in Identifier name,
          in VersionSpec version,
--        in CORBA_ParDescriptionSeq params, // only PARAM_INs
--        in CORBA_ExceptionDefSeq exceptions
-+        in CORBA::ParDescriptionSeq params, // only PARAM_INs
-+        in CORBA::ExceptionDefSeq exceptions
+-        in CORBA::ParDescriptionSeq params, // only PARAM_INs
+-        in CORBA::ExceptionDefSeq exceptions
++        in CORBA_ParDescriptionSeq params, // only PARAM_INs
++        in CORBA_ExceptionDefSeq exceptions
        );
      FinderDef create_finder (
          in RepositoryId id,
          in Identifier name,
          in VersionSpec version,
--        in CORBA_ParDescriptionSeq params, // only PARAM_INs
--        in CORBA_ExceptionDefSeq exceptions
-+        in CORBA::ParDescriptionSeq params, // only PARAM_INs
-+        in CORBA::ExceptionDefSeq exceptions
+-        in CORBA::ParDescriptionSeq params, // only PARAM_INs
+-        in CORBA::ExceptionDefSeq exceptions
++        in CORBA_ParDescriptionSeq params, // only PARAM_INs
++        in CORBA_ExceptionDefSeq exceptions
        );
    };
  
-@@ -310,8 +348,8 @@
+@@ -348,8 +310,8 @@
      PrimaryKeyDef primary_key_def;
      FactoryDefSeq factories;
      FinderDefSeq finders;
--    CORBA_OpDescriptionSeq operations;
--    CORBA_AttrDescriptionSeq attributes;
-+    CORBA::OpDescriptionSeq operations;
-+    CORBA::AttrDescriptionSeq attributes;
+-    CORBA::OpDescriptionSeq operations;
+-    CORBA::AttrDescriptionSeq attributes;
++    CORBA_OpDescriptionSeq operations;
++    CORBA_AttrDescriptionSeq attributes;
      boolean is_basic;
    };
  };
diff --git a/TAO/tao/IFR_Client/diffs/IFR_Extended.pidl.diff b/TAO/tao/IFR_Client/diffs/IFR_Extended.pidl.diff
index 2da32bf4fb1..f29261ea773 100644
--- a/TAO/tao/IFR_Client/diffs/IFR_Extended.pidl.diff
+++ b/TAO/tao/IFR_Client/diffs/IFR_Extended.pidl.diff
@@ -1,189 +1,190 @@
---- orig/IFR_Extended.pidl	Mon Apr 23 20:20:09 2001
-+++ IFR_Extended.pidl	Fri Apr 20 03:06:40 2001
-@@ -71,114 +71,122 @@
+--- IFR_Extended.pidl.old	Fri Jun  1 23:02:10 2001
++++ IFR_Extended.pidl	Fri Jun  1 22:58:48 2001
+@@ -71,123 +71,115 @@
  
  module CORBA
  {
-+  typedef short ValueModifier; // PIDL
-+  const ValueModifier VM_NONE = 0;
-+  const ValueModifier VM_CUSTOM = 1;
-+  const ValueModifier VM_ABSTRACT = 2;
-+  const ValueModifier VM_TRUNCATABLE = 3;
-+
+-  typedef short ValueModifier; // PIDL
+-  const ValueModifier VM_NONE = 0;
+-  const ValueModifier VM_CUSTOM = 1;
+-  const ValueModifier VM_ABSTRACT = 2;
+-  const ValueModifier VM_TRUNCATABLE = 3;
+-
    typedef short Visibility;
--};
-+  const Visibility PRIVATE_MEMBER = 0;
-+  const Visibility PUBLIC_MEMBER = 1;
+-  const Visibility PRIVATE_MEMBER = 0;
+-  const Visibility PUBLIC_MEMBER = 1;
++};
  
--  interface CORBA_FixedDef : CORBA_IDLType 
-+  interface FixedDef : IDLType 
+-  interface FixedDef : IDLType 
++  interface CORBA_FixedDef : CORBA_IDLType 
    {
      attribute unsigned short digits;
      attribute short scale;
    };
  
--  struct CORBA_ValueMember 
-+  struct ValueMember 
+-  struct ValueMember 
++  struct CORBA_ValueMember 
    {
--    string name;
--    string id;
--    string defined_in;
--    string version;
--    CORBA::TypeCode type;
--    CORBA_IDLType type_def;
--    CORBA::Visibility access;
-+    Identifier name;
-+    RepositoryId id;
-+    RepositoryId defined_in;
-+    VersionSpec version;
-+    TypeCode type;
-+    IDLType type_def;
-+    Visibility access;
+-    Identifier name;
+-    RepositoryId id;
+-    RepositoryId defined_in;
+-    VersionSpec version;
+-    TypeCode type;
+-    IDLType type_def;
+-    Visibility access;
++    string name;
++    string id;
++    string defined_in;
++    string version;
++    CORBA::TypeCode type;
++    CORBA_IDLType type_def;
++    CORBA::Visibility access;
    };
  
--  typedef sequence <CORBA_ValueMember> CORBA_ValueMemberSeq;
-+  typedef sequence <ValueMember> ValueMemberSeq;
+-  typedef sequence <ValueMember> ValueMemberSeq;
++  typedef sequence <CORBA_ValueMember> CORBA_ValueMemberSeq;
  
--  interface CORBA_ValueMemberDef : CORBA_Contained 
-+  interface ValueMemberDef : Contained 
+-  interface ValueMemberDef : Contained 
++  interface CORBA_ValueMemberDef : CORBA_Contained 
    {
--    readonly attribute CORBA::TypeCode type;
--    attribute CORBA_IDLType type_def;
--    attribute CORBA::Visibility access;
-+    readonly attribute TypeCode type;
-+    attribute IDLType type_def;
-+    attribute Visibility access;
+-    readonly attribute TypeCode type;
+-    attribute IDLType type_def;
+-    attribute Visibility access;
++    readonly attribute CORBA::TypeCode type;
++    attribute CORBA_IDLType type_def;
++    attribute CORBA::Visibility access;
    };
  
--  interface CORBA_ValueDef : CORBA_Container, CORBA_Contained, CORBA_IDLType 
-+  interface ValueDef : Container, Contained, IDLType 
+-  interface ValueDef : Container, Contained, IDLType 
++  interface CORBA_ValueDef : CORBA_Container, CORBA_Contained, CORBA_IDLType 
    {
      // read/write interface
--    attribute CORBA_InterfaceDefSeq supported_interfaces;
--    attribute CORBA_InitializerSeq initializers;
--    attribute CORBA_ValueDef base_value;
--    attribute CORBA_ValueDefSeq abstract_base_values;
-+    attribute InterfaceDefSeq supported_interfaces;
-+    attribute InitializerSeq initializers;
-+    attribute ValueDef base_value;
-+    attribute ValueDefSeq abstract_base_values;
+-    attribute InterfaceDefSeq supported_interfaces;
+-    attribute InitializerSeq initializers;
+-    attribute ValueDef base_value;
+-    attribute ValueDefSeq abstract_base_values;
++    attribute CORBA_InterfaceDefSeq supported_interfaces;
++    attribute CORBA_InitializerSeq initializers;
++    attribute CORBA_ValueDef base_value;
++    attribute CORBA_ValueDefSeq abstract_base_values;
      // read interface
      attribute boolean is_abstract;
      attribute boolean is_custom;
      attribute boolean is_truncatable;
      boolean is_a (
--        in string id
-+        in RepositoryId id
+-        in RepositoryId id
++        in string id
        );
  
      struct FullValueDescription 
      {
--      string name;
--      string id;
-+      Identifier name;
-+      RepositoryId id;
+-      Identifier name;
+-      RepositoryId id;
++      string name;
++      string id;
        boolean is_abstract;
        boolean is_custom;
--      string defined_in;
--      string version;
--      CORBA_OpDescriptionSeq operations;
--      CORBA_AttrDescriptionSeq attributes;
--      CORBA_ValueMemberSeq members;
--      CORBA_InitializerSeq initializers;
--      CORBA_RepositoryIdSeq supported_interfaces;
--      CORBA_RepositoryIdSeq abstract_base_values;
-+      RepositoryId defined_in;
-+      VersionSpec version;
-+      OpDescriptionSeq operations;
-+      AttrDescriptionSeq attributes;
-+      ValueMemberSeq members;
-+      InitializerSeq initializers;
-+      RepositoryIdSeq supported_interfaces;
-+      RepositoryIdSeq abstract_base_values;
+-      RepositoryId defined_in;
+-      VersionSpec version;
+-      OpDescriptionSeq operations;
+-      AttrDescriptionSeq attributes;
+-      ValueMemberSeq members;
+-      InitializerSeq initializers;
+-      RepositoryIdSeq supported_interfaces;
+-      RepositoryIdSeq abstract_base_values;
++      string defined_in;
++      string version;
++      CORBA_OpDescriptionSeq operations;
++      CORBA_AttrDescriptionSeq attributes;
++      CORBA_ValueMemberSeq members;
++      CORBA_InitializerSeq initializers;
++      CORBA_RepositoryIdSeq supported_interfaces;
++      CORBA_RepositoryIdSeq abstract_base_values;
        boolean is_truncatable;
--      string base_value;
--      CORBA::TypeCode type;
-+      RepositoryId base_value;
-+      TypeCode type;
+-      RepositoryId base_value;
+-      TypeCode type;
++      string base_value;
++      CORBA::TypeCode type;
      };
  
      FullValueDescription describe_value ();
        
--    CORBA_ValueMemberDef create_value_member  (
--        in string id,
--        in string name,
--        in string version,
--        in CORBA_IDLType type,
--        in CORBA::Visibility access
-+    ValueMemberDef create_value_member  (
-+        in RepositoryId id,
-+        in Identifier name,
-+        in VersionSpec version,
-+        in IDLType type,
-+        in Visibility access
+-    ValueMemberDef create_value_member  (
+-        in RepositoryId id,
+-        in Identifier name,
+-        in VersionSpec version,
+-        in IDLType type,
+-        in Visibility access
++    CORBA_ValueMemberDef create_value_member  (
++        in string id,
++        in string name,
++        in string version,
++        in CORBA_IDLType type,
++        in CORBA::Visibility access
        );
--    CORBA_AttributeDef create_attribute (
--        in string id,
--        in string name,
--        in string version,
--        in CORBA_IDLType type,
--        in CORBA::AttributeMode mode
-+    AttributeDef create_attribute (
-+        in RepositoryId id,
-+        in Identifier name,
-+        in VersionSpec version,
-+        in IDLType type,
-+        in AttributeMode mode
+-    AttributeDef create_attribute (
+-        in RepositoryId id,
+-        in Identifier name,
+-        in VersionSpec version,
+-        in IDLType type,
+-        in AttributeMode mode
++    CORBA_AttributeDef create_attribute (
++        in string id,
++        in string name,
++        in string version,
++        in CORBA_IDLType type,
++        in CORBA::AttributeMode mode
        );
--    CORBA_OperationDef create_operation (
--        in string id,
--        in string name,
--        in string version,
--        in CORBA_IDLType result,
--        in CORBA::OperationMode mode,
--        in CORBA_ParDescriptionSeq params,
--        in CORBA_ExceptionDefSeq exceptions,
--        in CORBA_ContextIdSeq contexts
-+    OperationDef create_operation (
-+        in RepositoryId id,
-+        in Identifier name,
-+        in VersionSpec version,
-+        in IDLType result,
-+        in OperationMode mode,
-+        in ParDescriptionSeq params,
-+        in ExceptionDefSeq exceptions,
-+        in ContextIdSeq contexts
+-    OperationDef create_operation (
+-        in RepositoryId id,
+-        in Identifier name,
+-        in VersionSpec version,
+-        in IDLType result,
+-        in OperationMode mode,
+-        in ParDescriptionSeq params,
+-        in ExceptionDefSeq exceptions,
+-        in ContextIdSeq contexts
++    CORBA_OperationDef create_operation (
++        in string id,
++        in string name,
++        in string version,
++        in CORBA_IDLType result,
++        in CORBA::OperationMode mode,
++        in CORBA_ParDescriptionSeq params,
++        in CORBA_ExceptionDefSeq exceptions,
++        in CORBA_ContextIdSeq contexts
        );
    };
  
--  struct CORBA_ValueDescription 
-+  struct ValueDescription 
+-  struct ValueDescription 
++  struct CORBA_ValueDescription 
    {
--    string name;
--    string id;
-+    Identifier name;
-+    RepositoryId id;
+-    Identifier name;
+-    RepositoryId id;
++    string name;
++    string id;
      boolean is_abstract;
      boolean is_custom;
--    string defined_in;
--    string version;
--    CORBA_RepositoryIdSeq supported_interfaces;
--    CORBA_RepositoryIdSeq abstract_base_values;
-+    RepositoryId defined_in;
-+    VersionSpec version;
-+    RepositoryIdSeq supported_interfaces;
-+    RepositoryIdSeq abstract_base_values;
+-    RepositoryId defined_in;
+-    VersionSpec version;
+-    RepositoryIdSeq supported_interfaces;
+-    RepositoryIdSeq abstract_base_values;
++    string defined_in;
++    string version;
++    CORBA_RepositoryIdSeq supported_interfaces;
++    CORBA_RepositoryIdSeq abstract_base_values;
      boolean is_truncatable;
--    string base_value;
-+    RepositoryId base_value;
+-    RepositoryId base_value;
++    string base_value;
    };
  
--  interface CORBA_ValueBoxDef : CORBA_TypedefDef 
-+  interface ValueBoxDef : TypedefDef 
+-  interface ValueBoxDef : TypedefDef 
++  interface CORBA_ValueBoxDef : CORBA_TypedefDef 
    {
--    attribute CORBA_IDLType original_type_def;
-+    attribute IDLType original_type_def;
-+  };
+-    attribute IDLType original_type_def;
++    attribute CORBA_IDLType original_type_def;
    };
+-};
  
  #pragma prefix ""
+