*** empty log message ***

6 files changed, 365 insertions, 354 deletions

diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c
index 29a3769b6fc..06668ea6354 100644
--- a/TAO/ChangeLog-98c
+++ b/TAO/ChangeLog-98c
@@ -1,10 +1,21 @@
+Wed Apr 29 14:06:35 1998  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
+
+	* tao/{Object, POAC, POAS, PolicyC, PolicyS}.cpp: Moved all the
+	static Param_Data and Call_Data tables from the outer global scope
+	to the scope of the respective stubs and skeletons. This was
+	necessary since the ORB-owned typecodes are now dynamically
+	allocated. Thus, if the tables remain in the global scope, the
+	values for typecodes get initialized to NUL. Thanks to Naga,
+	Sergio, and Sumedh who were trying in vain to understand why
+	things were failing.
+
 Wed Apr 29 12:26:12 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
-	* orbsvcs/tests/EC_Multiple/Makefile: 
-	* orbsvcs/tests/EC_Multiple/EC_Multiple.h: 
-	* orbsvcs/tests/EC_Multiple/Scheduler_Runtime1.h: 
-	* orbsvcs/tests/EC_Multiple/Scheduler_Runtime2.h: 
-	* orbsvcs/tests/EC_Multiple/EC_Multiple.cpp: 
+	* orbsvcs/tests/EC_Multiple/Makefile:
+	* orbsvcs/tests/EC_Multiple/EC_Multiple.h:
+	* orbsvcs/tests/EC_Multiple/Scheduler_Runtime1.h:
+	* orbsvcs/tests/EC_Multiple/Scheduler_Runtime2.h:
+	* orbsvcs/tests/EC_Multiple/EC_Multiple.cpp:
 	  Added two precomputed schedules that are selected when the
 	  argument to -s is either RUNTIME1 or RUNTIME2, but it is still
 	  possible to have a global scheduler (-g) or to compute new
@@ -12,13 +23,13 @@ Wed Apr 29 12:26:12 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
 	  The amount of work performed in the high priority threads can be
 	  controlled using the -w option.
 
-	* orbsvcs/tests/EC_Multiple/latency.pl: 
-	* orbsvcs/tests/EC_Multiple/run_utilization: 
-	* orbsvcs/tests/EC_Multiple/run_overhead: 
-	* orbsvcs/tests/EC_Multiple/run_latency: 
-	* orbsvcs/tests/EC_Multiple/gen_utilization: 
-	* orbsvcs/tests/EC_Multiple/gen_overhead: 
-	* orbsvcs/tests/EC_Multiple/gen_latency: 
+	* orbsvcs/tests/EC_Multiple/latency.pl:
+	* orbsvcs/tests/EC_Multiple/run_utilization:
+	* orbsvcs/tests/EC_Multiple/run_overhead:
+	* orbsvcs/tests/EC_Multiple/run_latency:
+	* orbsvcs/tests/EC_Multiple/gen_utilization:
+	* orbsvcs/tests/EC_Multiple/gen_overhead:
+	* orbsvcs/tests/EC_Multiple/gen_latency:
 	  This scripts execute the test with different configurations
 	  designed to measure latency, overhead, utilization, etc.
 	  The run_* scripts execute the test, the gen_* scripts filter the
@@ -27,13 +38,13 @@ Wed Apr 29 12:26:12 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
 	  I've tried to make the file naming conventions consistent so its
 	  easier to add new scripts or tests.
 
-	* orbsvcs/Naming_Service/Naming_Service.h: 
-	* orbsvcs/Naming_Service/Naming_Service.cpp: 
+	* orbsvcs/Naming_Service/Naming_Service.h:
+	* orbsvcs/Naming_Service/Naming_Service.cpp:
 	  Added an option (-p) to dump the process ID into a file, this is
 	  useful when running the service from a script that has to shut
 	  it down.
 
-	* orbsvcs/orbsvcs/Scheduler_Factory.cpp: 
+	* orbsvcs/orbsvcs/Scheduler_Factory.cpp:
 	  Fixed some memory managment problems, but the whole class has to
 	  be revised to be more complaint.
 
diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp
index 4234c02e10c..c038b3f8444 100644
--- a/TAO/tao/Object.cpp
+++ b/TAO/tao/Object.cpp
@@ -14,21 +14,6 @@
 // GET_INTERFACE ... send a simple call to the object, it returns
 // an InterfaceDef objref.
 
-static const TAO_Param_Data Object_get_interface_params [] =
-{
-  { CORBA::_tc_Object, PARAM_RETURN, 0 }
-  // XXX should be tc_InterfaceDef
-};
-
-static const TAO_Call_Data Object_get_interface_calldata =
-{
-  "_interface",
-  CORBA::B_TRUE,
-  1,
-  &Object_get_interface_params [0],
-  0, 0
-};
-
 CORBA_Object::~CORBA_Object (void)
 {
   this->parent_->Release ();
@@ -70,6 +55,21 @@ CORBA::release (CORBA_Object_ptr obj)
 CORBA::InterfaceDef_ptr
 CORBA_Object::_get_interface (CORBA::Environment &env)
 {
+  static const TAO_Param_Data Object_get_interface_params [] =
+  {
+    { CORBA::_tc_Object, PARAM_RETURN, 0 }
+    // XXX should be tc_InterfaceDef
+  };
+
+  static const TAO_Call_Data Object_get_interface_calldata =
+  {
+    "_interface",
+    CORBA::B_TRUE,
+    1,
+    &Object_get_interface_params [0],
+    0, 0
+  };
+
   CORBA::InterfaceDef_ptr retval = 0;
 
   // At this time, we only have a single generic way to find the CORBA
@@ -101,23 +101,23 @@ CORBA_Object::_get_interface (CORBA::Environment &env)
 // IS_A ... ask the object if it's an instance of the type whose
 // logical type ID is passed as a parameter.
 
-static const TAO_Param_Data Object_is_a_params [] =
-{
-  { CORBA::_tc_boolean, PARAM_RETURN, 0 },
-  { CORBA::_tc_string, PARAM_IN, 0 }
-};
-
-static const TAO_Call_Data Object_is_a_calldata =
-{
-  "_is_a", CORBA::B_TRUE,
-  2, &Object_is_a_params [0],
-  0, 0
-};
-
 CORBA::Boolean
 CORBA_Object::_is_a (const CORBA::Char *type_id,
                      CORBA::Environment &env)
 {
+  static const TAO_Param_Data Object_is_a_params [] =
+  {
+    { CORBA::_tc_boolean, PARAM_RETURN, 0 },
+    { CORBA::_tc_string, PARAM_IN, 0 }
+  };
+
+  static const TAO_Call_Data Object_is_a_calldata =
+  {
+    "_is_a", CORBA::B_TRUE,
+    2, &Object_is_a_params [0],
+    0, 0
+  };
+
   // If the object is collocated then try locally....
   if (this->is_collocated_ && this->servant_ != 0)
     return this->servant_->_is_a (type_id, env);
@@ -187,24 +187,24 @@ CORBA_Object::_is_collocated (void) const
 // GET_IMPLEMENTATION ... send a simple call to the object, it returns
 // an ImplementationDef objref.
 
-static const TAO_Param_Data Object_get_implementation_params [] =
-{
-  { CORBA::_tc_Object, PARAM_RETURN, 0 }
-  // XXX should be tc_ImplementationDef
-};
-
-static const TAO_Call_Data Object_get_implementation_calldata =
-{
-  "_implementation",
-  CORBA::B_TRUE,
-  1,
-  &Object_get_implementation_params [0],
-  0, 0
-};
-
 CORBA::ImplementationDef_ptr
 CORBA_Object::_get_implementation (CORBA::Environment &env)
 {
+  static const TAO_Param_Data Object_get_implementation_params [] =
+  {
+    { CORBA::_tc_Object, PARAM_RETURN, 0 }
+    // XXX should be tc_ImplementationDef
+  };
+
+  static const TAO_Call_Data Object_get_implementation_calldata =
+  {
+    "_implementation",
+    CORBA::B_TRUE,
+    1,
+    &Object_get_implementation_params [0],
+    0, 0
+  };
+
   STUB_Object *istub;
   CORBA::ImplementationDef_ptr  retval = 0;
 
@@ -224,21 +224,21 @@ CORBA_Object::_get_implementation (CORBA::Environment &env)
 // either elicit a FALSE response or a OBJECT_NOT_EXIST exception.  In
 // the latter case, return FALSE.
 
-static const TAO_Param_Data Object_non_existent_params [] =
-{
-  { CORBA::_tc_boolean, PARAM_RETURN, 0 }
-};
-
-static const TAO_Call_Data Object_non_existent_calldata =
-{
-  "_non_existent", CORBA::B_TRUE,
-  1, &Object_non_existent_params [0],
-  0, 0
-};
-
 CORBA::Boolean
 CORBA_Object::_non_existent (CORBA::Environment &env)
 {
+  static const TAO_Param_Data Object_non_existent_params [] =
+  {
+    { CORBA::_tc_boolean, PARAM_RETURN, 0 }
+  };
+
+  static const TAO_Call_Data Object_non_existent_calldata =
+  {
+    "_non_existent", CORBA::B_TRUE,
+    1, &Object_non_existent_params [0],
+    0, 0
+  };
+
   CORBA::Boolean retval = CORBA::B_FALSE;
   STUB_Object *istub;
 
diff --git a/TAO/tao/POAC.cpp b/TAO/tao/POAC.cpp
index ecfd1638379..688ce6cebe3 100644
--- a/TAO/tao/POAC.cpp
+++ b/TAO/tao/POAC.cpp
@@ -239,15 +239,15 @@ PortableServer::ThreadPolicy_ptr PortableServer::ThreadPolicy::_bind (const char
   return PortableServer::ThreadPolicy::_narrow (objref, env);
 }
 
-static const TAO_Param_Data _get_PortableServer_ThreadPolicy_value_paramdata [] =
+PortableServer::ThreadPolicyValue PortableServer::ThreadPolicy::value(CORBA::Environment &env)
 {
-  {PortableServer::_tc_ThreadPolicyValue, PARAM_RETURN, 0}};
+  static const TAO_Param_Data _get_PortableServer_ThreadPolicy_value_paramdata [] =
+  {
+    {PortableServer::_tc_ThreadPolicyValue, PARAM_RETURN, 0}};
 
-static const TAO_Call_Data _get_PortableServer_ThreadPolicy_value_calldata =
-{"_get_value", 1, 1, _get_PortableServer_ThreadPolicy_value_paramdata, 0, 0};
+  static const TAO_Call_Data _get_PortableServer_ThreadPolicy_value_calldata =
+  {"_get_value", 1, 1, _get_PortableServer_ThreadPolicy_value_paramdata, 0, 0};
 
-PortableServer::ThreadPolicyValue PortableServer::ThreadPolicy::value(CORBA::Environment &env)
-{
   PortableServer::ThreadPolicyValue retval;
   STUB_Object *istub;
 
@@ -343,15 +343,15 @@ PortableServer::LifespanPolicy_ptr PortableServer::LifespanPolicy::_bind (const
   return PortableServer::LifespanPolicy::_narrow (objref, env);
 }
 
-static const TAO_Param_Data _get_PortableServer_LifespanPolicy_value_paramdata [] =
+PortableServer::LifespanPolicyValue PortableServer::LifespanPolicy::value(CORBA::Environment &env)
 {
-  {PortableServer::_tc_LifespanPolicyValue, PARAM_RETURN, 0}};
+  static const TAO_Param_Data _get_PortableServer_LifespanPolicy_value_paramdata [] =
+  {
+    {PortableServer::_tc_LifespanPolicyValue, PARAM_RETURN, 0}};
 
-static const TAO_Call_Data _get_PortableServer_LifespanPolicy_value_calldata =
-{"_get_value", 1, 1, _get_PortableServer_LifespanPolicy_value_paramdata, 0, 0};
+  static const TAO_Call_Data _get_PortableServer_LifespanPolicy_value_calldata =
+  {"_get_value", 1, 1, _get_PortableServer_LifespanPolicy_value_paramdata, 0, 0};
 
-PortableServer::LifespanPolicyValue PortableServer::LifespanPolicy::value(CORBA::Environment &env)
-{
   PortableServer::LifespanPolicyValue retval;
   STUB_Object *istub;
 
@@ -447,15 +447,15 @@ PortableServer::IdUniquenessPolicy_ptr PortableServer::IdUniquenessPolicy::_bind
   return PortableServer::IdUniquenessPolicy::_narrow (objref, env);
 }
 
-static const TAO_Param_Data _get_PortableServer_IdUniquenessPolicy_value_paramdata [] =
+PortableServer::IdUniquenessPolicyValue PortableServer::IdUniquenessPolicy::value(CORBA::Environment &env)
 {
-  {PortableServer::_tc_IdUniquenessPolicyValue, PARAM_RETURN, 0}};
+  static const TAO_Param_Data _get_PortableServer_IdUniquenessPolicy_value_paramdata [] =
+  {
+    {PortableServer::_tc_IdUniquenessPolicyValue, PARAM_RETURN, 0}};
 
-static const TAO_Call_Data _get_PortableServer_IdUniquenessPolicy_value_calldata =
-{"_get_value", 1, 1, _get_PortableServer_IdUniquenessPolicy_value_paramdata, 0, 0};
+  static const TAO_Call_Data _get_PortableServer_IdUniquenessPolicy_value_calldata =
+  {"_get_value", 1, 1, _get_PortableServer_IdUniquenessPolicy_value_paramdata, 0, 0};
 
-PortableServer::IdUniquenessPolicyValue PortableServer::IdUniquenessPolicy::value(CORBA::Environment &env)
-{
   PortableServer::IdUniquenessPolicyValue retval;
   STUB_Object *istub;
 
@@ -551,15 +551,15 @@ PortableServer::IdAssignmentPolicy_ptr PortableServer::IdAssignmentPolicy::_bind
   return PortableServer::IdAssignmentPolicy::_narrow (objref, env);
 }
 
-static const TAO_Param_Data _get_PortableServer_IdAssignmentPolicy_value_paramdata [] =
+PortableServer::IdAssignmentPolicyValue PortableServer::IdAssignmentPolicy::value(CORBA::Environment &env)
 {
-  {PortableServer::_tc_IdAssignmentPolicyValue, PARAM_RETURN, 0}};
+  static const TAO_Param_Data _get_PortableServer_IdAssignmentPolicy_value_paramdata [] =
+  {
+    {PortableServer::_tc_IdAssignmentPolicyValue, PARAM_RETURN, 0}};
 
-static const TAO_Call_Data _get_PortableServer_IdAssignmentPolicy_value_calldata =
-{"_get_value", 1, 1, _get_PortableServer_IdAssignmentPolicy_value_paramdata, 0, 0};
+  static const TAO_Call_Data _get_PortableServer_IdAssignmentPolicy_value_calldata =
+  {"_get_value", 1, 1, _get_PortableServer_IdAssignmentPolicy_value_paramdata, 0, 0};
 
-PortableServer::IdAssignmentPolicyValue PortableServer::IdAssignmentPolicy::value(CORBA::Environment &env)
-{
   PortableServer::IdAssignmentPolicyValue retval;
   STUB_Object *istub;
 
@@ -655,15 +655,15 @@ PortableServer::ImplicitActivationPolicy_ptr PortableServer::ImplicitActivationP
   return PortableServer::ImplicitActivationPolicy::_narrow (objref, env);
 }
 
-static const TAO_Param_Data _get_PortableServer_ImplicitActivationPolicy_value_paramdata [] =
+PortableServer::ImplicitActivationPolicyValue PortableServer::ImplicitActivationPolicy::value(CORBA::Environment &env)
 {
-  {PortableServer::_tc_ImplicitActivationPolicyValue, PARAM_RETURN, 0}};
+  static const TAO_Param_Data _get_PortableServer_ImplicitActivationPolicy_value_paramdata [] =
+  {
+    {PortableServer::_tc_ImplicitActivationPolicyValue, PARAM_RETURN, 0}};
 
-static const TAO_Call_Data _get_PortableServer_ImplicitActivationPolicy_value_calldata =
-{"_get_value", 1, 1, _get_PortableServer_ImplicitActivationPolicy_value_paramdata, 0, 0};
+  static const TAO_Call_Data _get_PortableServer_ImplicitActivationPolicy_value_calldata =
+  {"_get_value", 1, 1, _get_PortableServer_ImplicitActivationPolicy_value_paramdata, 0, 0};
 
-PortableServer::ImplicitActivationPolicyValue PortableServer::ImplicitActivationPolicy::value(CORBA::Environment &env)
-{
   PortableServer::ImplicitActivationPolicyValue retval;
   STUB_Object *istub;
 
@@ -759,15 +759,15 @@ PortableServer::ServantRetentionPolicy_ptr PortableServer::ServantRetentionPolic
   return PortableServer::ServantRetentionPolicy::_narrow (objref, env);
 }
 
-static const TAO_Param_Data _get_PortableServer_ServantRetentionPolicy_value_paramdata [] =
+PortableServer::ServantRetentionPolicyValue PortableServer::ServantRetentionPolicy::value(CORBA::Environment &env)
 {
-  {PortableServer::_tc_ServantRetentionPolicyValue, PARAM_RETURN, 0}};
+  static const TAO_Param_Data _get_PortableServer_ServantRetentionPolicy_value_paramdata [] =
+  {
+    {PortableServer::_tc_ServantRetentionPolicyValue, PARAM_RETURN, 0}};
 
-static const TAO_Call_Data _get_PortableServer_ServantRetentionPolicy_value_calldata =
-{"_get_value", 1, 1, _get_PortableServer_ServantRetentionPolicy_value_paramdata, 0, 0};
+  static const TAO_Call_Data _get_PortableServer_ServantRetentionPolicy_value_calldata =
+  {"_get_value", 1, 1, _get_PortableServer_ServantRetentionPolicy_value_paramdata, 0, 0};
 
-PortableServer::ServantRetentionPolicyValue PortableServer::ServantRetentionPolicy::value(CORBA::Environment &env)
-{
   PortableServer::ServantRetentionPolicyValue retval;
   STUB_Object *istub;
 
@@ -865,15 +865,15 @@ PortableServer::RequestProcessingPolicy_ptr PortableServer::RequestProcessingPol
   return PortableServer::RequestProcessingPolicy::_narrow (objref, env);
 }
 
-static const TAO_Param_Data _get_PortableServer_RequestProcessingPolicy_value_paramdata [] =
+PortableServer::RequestProcessingPolicyValue PortableServer::RequestProcessingPolicy::value(CORBA::Environment &env)
 {
-  {PortableServer::_tc_RequestProcessingPolicyValue, PARAM_RETURN, 0}};
+  static const TAO_Param_Data _get_PortableServer_RequestProcessingPolicy_value_paramdata [] =
+  {
+    {PortableServer::_tc_RequestProcessingPolicyValue, PARAM_RETURN, 0}};
 
-static const TAO_Call_Data _get_PortableServer_RequestProcessingPolicy_value_calldata =
-{"_get_value", 1, 1, _get_PortableServer_RequestProcessingPolicy_value_paramdata, 0, 0};
+  static const TAO_Call_Data _get_PortableServer_RequestProcessingPolicy_value_calldata =
+  {"_get_value", 1, 1, _get_PortableServer_RequestProcessingPolicy_value_paramdata, 0, 0};
 
-PortableServer::RequestProcessingPolicyValue PortableServer::RequestProcessingPolicy::value(CORBA::Environment &env)
-{
   PortableServer::RequestProcessingPolicyValue retval;
   STUB_Object *istub;
 
@@ -1827,16 +1827,16 @@ PortableServer::POA_ptr  PortableServer::Current::get_POA (CORBA::Environment &e
   return PortableServer::POA::_nil ();
 }
 
-static const TAO_Param_Data PortableServer_Current_get_object_id_paramdata [] =
+PortableServer::ObjectId * PortableServer::Current::get_object_id (CORBA::Environment &env)
 {
-  {PortableServer::_tc_ObjectId, PARAM_RETURN, sizeof (PortableServer::ObjectId)}
-};
+  static const TAO_Param_Data PortableServer_Current_get_object_id_paramdata [] =
+  {
+    {PortableServer::_tc_ObjectId, PARAM_RETURN, sizeof (PortableServer::ObjectId)}
+  };
 
-static const TAO_Call_Data PortableServer_Current_get_object_id_calldata =
-{"get_object_id", 1, 1, PortableServer_Current_get_object_id_paramdata, 0, 0};
+  static const TAO_Call_Data PortableServer_Current_get_object_id_calldata =
+  {"get_object_id", 1, 1, PortableServer_Current_get_object_id_paramdata, 0, 0};
 
-PortableServer::ObjectId * PortableServer::Current::get_object_id (CORBA::Environment &env)
-{
   PortableServer::ObjectId *retval = 0;
   STUB_Object *istub;
 
diff --git a/TAO/tao/POAS.cpp b/TAO/tao/POAS.cpp
index a2289d4a00d..bc2b10af0a0 100644
--- a/TAO/tao/POAS.cpp
+++ b/TAO/tao/POAS.cpp
@@ -28,13 +28,6 @@ POA_PortableServer::CurrentBase::CurrentBase (void)
   this->optable_ = &tao_PortableServer_CurrentBase_optable;
 }
 
-static const TAO_Param_Data_Skel PortableServer_CurrentBase_is_a_paramdata [] =
-{
-  {CORBA::_tc_boolean, 0, 0},
-  {CORBA::_tc_string, CORBA::ARG_IN, 0}
-};
-static const TAO_Call_Data_Skel PortableServer_CurrentBase_is_a_calldata =
-{"_is_a", 1, 2, PortableServer_CurrentBase_is_a_paramdata};
 void POA_PortableServer::CurrentBase::_is_a_skel (
     CORBA::ServerRequest &_tao_server_request,
     void * _tao_object_reference,
@@ -42,6 +35,13 @@ void POA_PortableServer::CurrentBase::_is_a_skel (
     CORBA::Environment &_tao_environment
   )
 {
+  static const TAO_Param_Data_Skel PortableServer_CurrentBase_is_a_paramdata [] =
+  {
+    {CORBA::_tc_boolean, 0, 0},
+    {CORBA::_tc_string, CORBA::ARG_IN, 0}
+  };
+  static const TAO_Call_Data_Skel PortableServer_CurrentBase_is_a_calldata =
+  {"_is_a", 1, 2, PortableServer_CurrentBase_is_a_paramdata};
   POA_PortableServer::CurrentBase_ptr  _tao_impl = (POA_PortableServer::CurrentBase_ptr) _tao_object_reference;
   CORBA::Boolean _tao_retval;
   char *_tao_value = 0;
@@ -160,21 +160,21 @@ POA_PortableServer::ThreadPolicy::ThreadPolicy (void)
   this->optable_ = &tao_PortableServer_ThreadPolicy_optable;
 }
 
-static const TAO_Param_Data_Skel _get_PortableServer_ThreadPolicy_value_paramdata [] =
-{
-  {PortableServer::_tc_ThreadPolicyValue, 0, 0}
-}; // PortableServer_ThreadPolicy_value_paramdata
-
-static const TAO_Call_Data_Skel _get_PortableServer_ThreadPolicy_value_calldata =
-{"_get_value", 1, 1, _get_PortableServer_ThreadPolicy_value_paramdata};
-
 void POA_PortableServer::ThreadPolicy::_get_value_skel (
     CORBA::ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void * /* context */,
     CORBA::Environment &_tao_environment
-)
+    )
 {
+  static const TAO_Param_Data_Skel _get_PortableServer_ThreadPolicy_value_paramdata [] =
+  {
+    {PortableServer::_tc_ThreadPolicyValue, 0, 0}
+  }; // PortableServer_ThreadPolicy_value_paramdata
+
+  static const TAO_Call_Data_Skel _get_PortableServer_ThreadPolicy_value_calldata =
+  {"_get_value", 1, 1, _get_PortableServer_ThreadPolicy_value_paramdata};
+
   POA_PortableServer::ThreadPolicy *_tao_impl = (POA_PortableServer::ThreadPolicy *)_tao_object_reference;
   PortableServer::ThreadPolicyValue _tao_retval;
   _tao_server_request.demarshal (
@@ -193,20 +193,20 @@ void POA_PortableServer::ThreadPolicy::_get_value_skel (
   );
 }
 
-static const TAO_Param_Data_Skel PortableServer_ThreadPolicy_is_a_paramdata [] =
-{
-  {CORBA::_tc_boolean, 0, 0},
-  {CORBA::_tc_string, CORBA::ARG_IN, 0}
-};
-static const TAO_Call_Data_Skel PortableServer_ThreadPolicy_is_a_calldata =
-{"_is_a", 1, 2, PortableServer_ThreadPolicy_is_a_paramdata};
 void POA_PortableServer::ThreadPolicy::_is_a_skel (
     CORBA::ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /*context*/,
     CORBA::Environment &_tao_environment
-  )
+    )
 {
+  static const TAO_Param_Data_Skel PortableServer_ThreadPolicy_is_a_paramdata [] =
+  {
+    {CORBA::_tc_boolean, 0, 0},
+    {CORBA::_tc_string, CORBA::ARG_IN, 0}
+  };
+  static const TAO_Call_Data_Skel PortableServer_ThreadPolicy_is_a_calldata =
+  {"_is_a", 1, 2, PortableServer_ThreadPolicy_is_a_paramdata};
   POA_PortableServer::ThreadPolicy_ptr  _tao_impl = (POA_PortableServer::ThreadPolicy_ptr) _tao_object_reference;
   CORBA::Boolean _tao_retval;
   char *_tao_value = 0;
@@ -362,14 +362,6 @@ POA_PortableServer::LifespanPolicy::LifespanPolicy (void)
   this->optable_ = &tao_PortableServer_LifespanPolicy_optable;
 }
 
-static const TAO_Param_Data_Skel _get_PortableServer_LifespanPolicy_value_paramdata [] =
-{
-  {PortableServer::_tc_LifespanPolicyValue, 0, 0}
-}; // PortableServer_LifespanPolicy_value_paramdata
-
-static const TAO_Call_Data_Skel _get_PortableServer_LifespanPolicy_value_calldata =
-{"_get_value", 1, 1, _get_PortableServer_LifespanPolicy_value_paramdata};
-
 void POA_PortableServer::LifespanPolicy::_get_value_skel (
     CORBA::ServerRequest &_tao_server_request,
     void *_tao_object_reference,
@@ -377,6 +369,14 @@ void POA_PortableServer::LifespanPolicy::_get_value_skel (
     CORBA::Environment &_tao_environment
 )
 {
+  static const TAO_Param_Data_Skel _get_PortableServer_LifespanPolicy_value_paramdata [] =
+  {
+    {PortableServer::_tc_LifespanPolicyValue, 0, 0}
+  }; // PortableServer_LifespanPolicy_value_paramdata
+
+  static const TAO_Call_Data_Skel _get_PortableServer_LifespanPolicy_value_calldata =
+  {"_get_value", 1, 1, _get_PortableServer_LifespanPolicy_value_paramdata};
+
   POA_PortableServer::LifespanPolicy *_tao_impl = (POA_PortableServer::LifespanPolicy *)_tao_object_reference;
   PortableServer::LifespanPolicyValue _tao_retval;
   _tao_server_request.demarshal (
@@ -395,13 +395,6 @@ void POA_PortableServer::LifespanPolicy::_get_value_skel (
   );
 }
 
-static const TAO_Param_Data_Skel PortableServer_LifespanPolicy_is_a_paramdata [] =
-{
-  {CORBA::_tc_boolean, 0, 0},
-  {CORBA::_tc_string, CORBA::ARG_IN, 0}
-};
-static const TAO_Call_Data_Skel PortableServer_LifespanPolicy_is_a_calldata =
-{"_is_a", 1, 2, PortableServer_LifespanPolicy_is_a_paramdata};
 void POA_PortableServer::LifespanPolicy::_is_a_skel (
     CORBA::ServerRequest &_tao_server_request,
     void * _tao_object_reference,
@@ -409,6 +402,13 @@ void POA_PortableServer::LifespanPolicy::_is_a_skel (
     CORBA::Environment &_tao_environment
   )
 {
+  static const TAO_Param_Data_Skel PortableServer_LifespanPolicy_is_a_paramdata [] =
+  {
+    {CORBA::_tc_boolean, 0, 0},
+    {CORBA::_tc_string, CORBA::ARG_IN, 0}
+  };
+  static const TAO_Call_Data_Skel PortableServer_LifespanPolicy_is_a_calldata =
+  {"_is_a", 1, 2, PortableServer_LifespanPolicy_is_a_paramdata};
   POA_PortableServer::LifespanPolicy_ptr  _tao_impl = (POA_PortableServer::LifespanPolicy_ptr) _tao_object_reference;
   CORBA::Boolean _tao_retval;
   char *_tao_value = 0;
@@ -563,14 +563,6 @@ POA_PortableServer::IdUniquenessPolicy::IdUniquenessPolicy (void)
   this->optable_ = &tao_PortableServer_IdUniquenessPolicy_optable;
 }
 
-static const TAO_Param_Data_Skel _get_PortableServer_IdUniquenessPolicy_value_paramdata [] =
-{
-  {PortableServer::_tc_IdUniquenessPolicyValue, 0, 0}
-}; // PortableServer_IdUniquenessPolicy_value_paramdata
-
-static const TAO_Call_Data_Skel _get_PortableServer_IdUniquenessPolicy_value_calldata =
-{"_get_value", 1, 1, _get_PortableServer_IdUniquenessPolicy_value_paramdata};
-
 void POA_PortableServer::IdUniquenessPolicy::_get_value_skel (
     CORBA::ServerRequest &_tao_server_request,
     void *_tao_object_reference,
@@ -578,6 +570,14 @@ void POA_PortableServer::IdUniquenessPolicy::_get_value_skel (
     CORBA::Environment &_tao_environment
 )
 {
+  static const TAO_Param_Data_Skel _get_PortableServer_IdUniquenessPolicy_value_paramdata [] =
+  {
+    {PortableServer::_tc_IdUniquenessPolicyValue, 0, 0}
+  }; // PortableServer_IdUniquenessPolicy_value_paramdata
+
+  static const TAO_Call_Data_Skel _get_PortableServer_IdUniquenessPolicy_value_calldata =
+  {"_get_value", 1, 1, _get_PortableServer_IdUniquenessPolicy_value_paramdata};
+
   POA_PortableServer::IdUniquenessPolicy *_tao_impl = (POA_PortableServer::IdUniquenessPolicy *)_tao_object_reference;
   PortableServer::IdUniquenessPolicyValue _tao_retval;
   _tao_server_request.demarshal (
@@ -596,13 +596,6 @@ void POA_PortableServer::IdUniquenessPolicy::_get_value_skel (
   );
 }
 
-static const TAO_Param_Data_Skel PortableServer_IdUniquenessPolicy_is_a_paramdata [] =
-{
-  {CORBA::_tc_boolean, 0, 0},
-  {CORBA::_tc_string, CORBA::ARG_IN, 0}
-};
-static const TAO_Call_Data_Skel PortableServer_IdUniquenessPolicy_is_a_calldata =
-{"_is_a", 1, 2, PortableServer_IdUniquenessPolicy_is_a_paramdata};
 void POA_PortableServer::IdUniquenessPolicy::_is_a_skel (
     CORBA::ServerRequest &_tao_server_request,
     void * _tao_object_reference,
@@ -610,6 +603,13 @@ void POA_PortableServer::IdUniquenessPolicy::_is_a_skel (
     CORBA::Environment &_tao_environment
   )
 {
+  static const TAO_Param_Data_Skel PortableServer_IdUniquenessPolicy_is_a_paramdata [] =
+  {
+    {CORBA::_tc_boolean, 0, 0},
+    {CORBA::_tc_string, CORBA::ARG_IN, 0}
+  };
+  static const TAO_Call_Data_Skel PortableServer_IdUniquenessPolicy_is_a_calldata =
+  {"_is_a", 1, 2, PortableServer_IdUniquenessPolicy_is_a_paramdata};
   POA_PortableServer::IdUniquenessPolicy_ptr  _tao_impl = (POA_PortableServer::IdUniquenessPolicy_ptr) _tao_object_reference;
   CORBA::Boolean _tao_retval;
   char *_tao_value = 0;
@@ -764,14 +764,6 @@ POA_PortableServer::IdAssignmentPolicy::IdAssignmentPolicy (void)
   this->optable_ = &tao_PortableServer_IdAssignmentPolicy_optable;
 }
 
-static const TAO_Param_Data_Skel _get_PortableServer_IdAssignmentPolicy_value_paramdata [] =
-{
-  {PortableServer::_tc_IdAssignmentPolicyValue, 0, 0}
-}; // PortableServer_IdAssignmentPolicy_value_paramdata
-
-static const TAO_Call_Data_Skel _get_PortableServer_IdAssignmentPolicy_value_calldata =
-{"_get_value", 1, 1, _get_PortableServer_IdAssignmentPolicy_value_paramdata};
-
 void POA_PortableServer::IdAssignmentPolicy::_get_value_skel (
     CORBA::ServerRequest &_tao_server_request,
     void *_tao_object_reference,
@@ -779,6 +771,14 @@ void POA_PortableServer::IdAssignmentPolicy::_get_value_skel (
     CORBA::Environment &_tao_environment
 )
 {
+  static const TAO_Param_Data_Skel _get_PortableServer_IdAssignmentPolicy_value_paramdata [] =
+  {
+    {PortableServer::_tc_IdAssignmentPolicyValue, 0, 0}
+  }; // PortableServer_IdAssignmentPolicy_value_paramdata
+
+  static const TAO_Call_Data_Skel _get_PortableServer_IdAssignmentPolicy_value_calldata =
+  {"_get_value", 1, 1, _get_PortableServer_IdAssignmentPolicy_value_paramdata};
+
   POA_PortableServer::IdAssignmentPolicy *_tao_impl = (POA_PortableServer::IdAssignmentPolicy *)_tao_object_reference;
   PortableServer::IdAssignmentPolicyValue _tao_retval;
   _tao_server_request.demarshal (
@@ -797,13 +797,6 @@ void POA_PortableServer::IdAssignmentPolicy::_get_value_skel (
   );
 }
 
-static const TAO_Param_Data_Skel PortableServer_IdAssignmentPolicy_is_a_paramdata [] =
-{
-  {CORBA::_tc_boolean, 0, 0},
-  {CORBA::_tc_string, CORBA::ARG_IN, 0}
-};
-static const TAO_Call_Data_Skel PortableServer_IdAssignmentPolicy_is_a_calldata =
-{"_is_a", 1, 2, PortableServer_IdAssignmentPolicy_is_a_paramdata};
 void POA_PortableServer::IdAssignmentPolicy::_is_a_skel (
     CORBA::ServerRequest &_tao_server_request,
     void * _tao_object_reference,
@@ -811,6 +804,13 @@ void POA_PortableServer::IdAssignmentPolicy::_is_a_skel (
     CORBA::Environment &_tao_environment
   )
 {
+  static const TAO_Param_Data_Skel PortableServer_IdAssignmentPolicy_is_a_paramdata [] =
+  {
+    {CORBA::_tc_boolean, 0, 0},
+    {CORBA::_tc_string, CORBA::ARG_IN, 0}
+  };
+  static const TAO_Call_Data_Skel PortableServer_IdAssignmentPolicy_is_a_calldata =
+  {"_is_a", 1, 2, PortableServer_IdAssignmentPolicy_is_a_paramdata};
   POA_PortableServer::IdAssignmentPolicy_ptr  _tao_impl = (POA_PortableServer::IdAssignmentPolicy_ptr) _tao_object_reference;
   CORBA::Boolean _tao_retval;
   char *_tao_value = 0;
@@ -965,21 +965,21 @@ POA_PortableServer::ImplicitActivationPolicy::ImplicitActivationPolicy (void)
   this->optable_ = &tao_PortableServer_ImplicitActivationPolicy_optable;
 }
 
-static const TAO_Param_Data_Skel _get_PortableServer_ImplicitActivationPolicy_value_paramdata [] =
-{
-  {PortableServer::_tc_ImplicitActivationPolicyValue, 0, 0}
-}; // PortableServer_ImplicitActivationPolicy_value_paramdata
-
-static const TAO_Call_Data_Skel _get_PortableServer_ImplicitActivationPolicy_value_calldata =
-{"_get_value", 1, 1, _get_PortableServer_ImplicitActivationPolicy_value_paramdata};
-
 void POA_PortableServer::ImplicitActivationPolicy::_get_value_skel (
     CORBA::ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void * /* context */,
     CORBA::Environment &_tao_environment
-)
+    )
 {
+  static const TAO_Param_Data_Skel _get_PortableServer_ImplicitActivationPolicy_value_paramdata [] =
+  {
+    {PortableServer::_tc_ImplicitActivationPolicyValue, 0, 0}
+  }; // PortableServer_ImplicitActivationPolicy_value_paramdata
+
+  static const TAO_Call_Data_Skel _get_PortableServer_ImplicitActivationPolicy_value_calldata =
+  {"_get_value", 1, 1, _get_PortableServer_ImplicitActivationPolicy_value_paramdata};
+
   POA_PortableServer::ImplicitActivationPolicy *_tao_impl = (POA_PortableServer::ImplicitActivationPolicy *)_tao_object_reference;
   PortableServer::ImplicitActivationPolicyValue _tao_retval;
   _tao_server_request.demarshal (
@@ -998,13 +998,6 @@ void POA_PortableServer::ImplicitActivationPolicy::_get_value_skel (
   );
 }
 
-static const TAO_Param_Data_Skel PortableServer_ImplicitActivationPolicy_is_a_paramdata [] =
-{
-  {CORBA::_tc_boolean, 0, 0},
-  {CORBA::_tc_string, CORBA::ARG_IN, 0}
-};
-static const TAO_Call_Data_Skel PortableServer_ImplicitActivationPolicy_is_a_calldata =
-{"_is_a", 1, 2, PortableServer_ImplicitActivationPolicy_is_a_paramdata};
 void POA_PortableServer::ImplicitActivationPolicy::_is_a_skel (
     CORBA::ServerRequest &_tao_server_request,
     void * _tao_object_reference,
@@ -1012,6 +1005,13 @@ void POA_PortableServer::ImplicitActivationPolicy::_is_a_skel (
     CORBA::Environment &_tao_environment
   )
 {
+  static const TAO_Param_Data_Skel PortableServer_ImplicitActivationPolicy_is_a_paramdata [] =
+  {
+    {CORBA::_tc_boolean, 0, 0},
+    {CORBA::_tc_string, CORBA::ARG_IN, 0}
+  };
+  static const TAO_Call_Data_Skel PortableServer_ImplicitActivationPolicy_is_a_calldata =
+  {"_is_a", 1, 2, PortableServer_ImplicitActivationPolicy_is_a_paramdata};
   POA_PortableServer::ImplicitActivationPolicy_ptr  _tao_impl = (POA_PortableServer::ImplicitActivationPolicy_ptr) _tao_object_reference;
   CORBA::Boolean _tao_retval;
   char *_tao_value = 0;
@@ -1166,14 +1166,6 @@ POA_PortableServer::ServantRetentionPolicy::ServantRetentionPolicy (void)
   this->optable_ = &tao_PortableServer_ServantRetentionPolicy_optable;
 }
 
-static const TAO_Param_Data_Skel _get_PortableServer_ServantRetentionPolicy_value_paramdata [] =
-{
-  {PortableServer::_tc_ServantRetentionPolicyValue, 0, 0}
-}; // PortableServer_ServantRetentionPolicy_value_paramdata
-
-static const TAO_Call_Data_Skel _get_PortableServer_ServantRetentionPolicy_value_calldata =
-{"_get_value", 1, 1, _get_PortableServer_ServantRetentionPolicy_value_paramdata};
-
 void POA_PortableServer::ServantRetentionPolicy::_get_value_skel (
     CORBA::ServerRequest &_tao_server_request,
     void *_tao_object_reference,
@@ -1181,6 +1173,14 @@ void POA_PortableServer::ServantRetentionPolicy::_get_value_skel (
     CORBA::Environment &_tao_environment
 )
 {
+  static const TAO_Param_Data_Skel _get_PortableServer_ServantRetentionPolicy_value_paramdata [] =
+  {
+    {PortableServer::_tc_ServantRetentionPolicyValue, 0, 0}
+  }; // PortableServer_ServantRetentionPolicy_value_paramdata
+
+  static const TAO_Call_Data_Skel _get_PortableServer_ServantRetentionPolicy_value_calldata =
+  {"_get_value", 1, 1, _get_PortableServer_ServantRetentionPolicy_value_paramdata};
+
   POA_PortableServer::ServantRetentionPolicy *_tao_impl = (POA_PortableServer::ServantRetentionPolicy *)_tao_object_reference;
   PortableServer::ServantRetentionPolicyValue _tao_retval;
   _tao_server_request.demarshal (
@@ -1199,13 +1199,6 @@ void POA_PortableServer::ServantRetentionPolicy::_get_value_skel (
   );
 }
 
-static const TAO_Param_Data_Skel PortableServer_ServantRetentionPolicy_is_a_paramdata [] =
-{
-  {CORBA::_tc_boolean, 0, 0},
-  {CORBA::_tc_string, CORBA::ARG_IN, 0}
-};
-static const TAO_Call_Data_Skel PortableServer_ServantRetentionPolicy_is_a_calldata =
-{"_is_a", 1, 2, PortableServer_ServantRetentionPolicy_is_a_paramdata};
 void POA_PortableServer::ServantRetentionPolicy::_is_a_skel (
     CORBA::ServerRequest &_tao_server_request,
     void * _tao_object_reference,
@@ -1213,6 +1206,13 @@ void POA_PortableServer::ServantRetentionPolicy::_is_a_skel (
     CORBA::Environment &_tao_environment
   )
 {
+  static const TAO_Param_Data_Skel PortableServer_ServantRetentionPolicy_is_a_paramdata [] =
+  {
+    {CORBA::_tc_boolean, 0, 0},
+    {CORBA::_tc_string, CORBA::ARG_IN, 0}
+  };
+  static const TAO_Call_Data_Skel PortableServer_ServantRetentionPolicy_is_a_calldata =
+  {"_is_a", 1, 2, PortableServer_ServantRetentionPolicy_is_a_paramdata};
   POA_PortableServer::ServantRetentionPolicy_ptr  _tao_impl = (POA_PortableServer::ServantRetentionPolicy_ptr) _tao_object_reference;
   CORBA::Boolean _tao_retval;
   char *_tao_value = 0;
@@ -1367,14 +1367,6 @@ POA_PortableServer::RequestProcessingPolicy::RequestProcessingPolicy (void)
   this->optable_ = &tao_PortableServer_RequestProcessingPolicy_optable;
 }
 
-static const TAO_Param_Data_Skel _get_PortableServer_RequestProcessingPolicy_value_paramdata [] =
-{
-  {PortableServer::_tc_RequestProcessingPolicyValue, 0, 0}
-}; // PortableServer_RequestProcessingPolicy_value_paramdata
-
-static const TAO_Call_Data_Skel _get_PortableServer_RequestProcessingPolicy_value_calldata =
-{"_get_value", 1, 1, _get_PortableServer_RequestProcessingPolicy_value_paramdata};
-
 void POA_PortableServer::RequestProcessingPolicy::_get_value_skel (
     CORBA::ServerRequest &_tao_server_request,
     void *_tao_object_reference,
@@ -1382,6 +1374,14 @@ void POA_PortableServer::RequestProcessingPolicy::_get_value_skel (
     CORBA::Environment &_tao_environment
 )
 {
+  static const TAO_Param_Data_Skel _get_PortableServer_RequestProcessingPolicy_value_paramdata [] =
+  {
+    {PortableServer::_tc_RequestProcessingPolicyValue, 0, 0}
+  }; // PortableServer_RequestProcessingPolicy_value_paramdata
+
+  static const TAO_Call_Data_Skel _get_PortableServer_RequestProcessingPolicy_value_calldata =
+  {"_get_value", 1, 1, _get_PortableServer_RequestProcessingPolicy_value_paramdata};
+
   POA_PortableServer::RequestProcessingPolicy *_tao_impl = (POA_PortableServer::RequestProcessingPolicy *)_tao_object_reference;
   PortableServer::RequestProcessingPolicyValue _tao_retval;
   _tao_server_request.demarshal (
@@ -1400,13 +1400,6 @@ void POA_PortableServer::RequestProcessingPolicy::_get_value_skel (
   );
 }
 
-static const TAO_Param_Data_Skel PortableServer_RequestProcessingPolicy_is_a_paramdata [] =
-{
-  {CORBA::_tc_boolean, 0, 0},
-  {CORBA::_tc_string, CORBA::ARG_IN, 0}
-};
-static const TAO_Call_Data_Skel PortableServer_RequestProcessingPolicy_is_a_calldata =
-{"_is_a", 1, 2, PortableServer_RequestProcessingPolicy_is_a_paramdata};
 void POA_PortableServer::RequestProcessingPolicy::_is_a_skel (
     CORBA::ServerRequest &_tao_server_request,
     void * _tao_object_reference,
@@ -1414,6 +1407,13 @@ void POA_PortableServer::RequestProcessingPolicy::_is_a_skel (
     CORBA::Environment &_tao_environment
   )
 {
+  static const TAO_Param_Data_Skel PortableServer_RequestProcessingPolicy_is_a_paramdata [] =
+  {
+    {CORBA::_tc_boolean, 0, 0},
+    {CORBA::_tc_string, CORBA::ARG_IN, 0}
+  };
+  static const TAO_Call_Data_Skel PortableServer_RequestProcessingPolicy_is_a_calldata =
+  {"_is_a", 1, 2, PortableServer_RequestProcessingPolicy_is_a_paramdata};
   POA_PortableServer::RequestProcessingPolicy_ptr  _tao_impl = (POA_PortableServer::RequestProcessingPolicy_ptr) _tao_object_reference;
   CORBA::Boolean _tao_retval;
   char *_tao_value = 0;
@@ -1564,13 +1564,6 @@ POA_PortableServer::POAManager::POAManager (void)
   this->optable_ = &tao_PortableServer_POAManager_optable;
 }
 
-static const TAO_Param_Data_Skel PortableServer_POAManager_is_a_paramdata [] =
-{
-  {CORBA::_tc_boolean, 0, 0},
-  {CORBA::_tc_string, CORBA::ARG_IN, 0}
-};
-static const TAO_Call_Data_Skel PortableServer_POAManager_is_a_calldata =
-{"_is_a", 1, 2, PortableServer_POAManager_is_a_paramdata};
 void POA_PortableServer::POAManager::_is_a_skel (
     CORBA::ServerRequest &_tao_server_request,
     void * _tao_object_reference,
@@ -1578,6 +1571,13 @@ void POA_PortableServer::POAManager::_is_a_skel (
     CORBA::Environment &_tao_environment
   )
 {
+  static const TAO_Param_Data_Skel PortableServer_POAManager_is_a_paramdata [] =
+  {
+    {CORBA::_tc_boolean, 0, 0},
+    {CORBA::_tc_string, CORBA::ARG_IN, 0}
+  };
+  static const TAO_Call_Data_Skel PortableServer_POAManager_is_a_calldata =
+  {"_is_a", 1, 2, PortableServer_POAManager_is_a_paramdata};
   POA_PortableServer::POAManager_ptr  _tao_impl = (POA_PortableServer::POAManager_ptr) _tao_object_reference;
   CORBA::Boolean _tao_retval;
   char *_tao_value = 0;
@@ -1736,13 +1736,6 @@ POA_PortableServer::AdapterActivator::AdapterActivator (void)
   this->optable_ = &tao_PortableServer_AdapterActivator_optable;
 }
 
-static const TAO_Param_Data_Skel PortableServer_AdapterActivator_is_a_paramdata [] =
-{
-  {CORBA::_tc_boolean, 0, 0},
-  {CORBA::_tc_string, CORBA::ARG_IN, 0}
-};
-static const TAO_Call_Data_Skel PortableServer_AdapterActivator_is_a_calldata =
-{"_is_a", 1, 2, PortableServer_AdapterActivator_is_a_paramdata};
 void POA_PortableServer::AdapterActivator::_is_a_skel (
     CORBA::ServerRequest &_tao_server_request,
     void * _tao_object_reference,
@@ -1750,6 +1743,13 @@ void POA_PortableServer::AdapterActivator::_is_a_skel (
     CORBA::Environment &_tao_environment
   )
 {
+  static const TAO_Param_Data_Skel PortableServer_AdapterActivator_is_a_paramdata [] =
+  {
+    {CORBA::_tc_boolean, 0, 0},
+    {CORBA::_tc_string, CORBA::ARG_IN, 0}
+  };
+  static const TAO_Call_Data_Skel PortableServer_AdapterActivator_is_a_calldata =
+  {"_is_a", 1, 2, PortableServer_AdapterActivator_is_a_paramdata};
   POA_PortableServer::AdapterActivator_ptr  _tao_impl = (POA_PortableServer::AdapterActivator_ptr) _tao_object_reference;
   CORBA::Boolean _tao_retval;
   char *_tao_value = 0;
@@ -1877,13 +1877,6 @@ POA_PortableServer::ServantManager::ServantManager (void)
   this->optable_ = &tao_PortableServer_ServantManager_optable;
 }
 
-static const TAO_Param_Data_Skel PortableServer_ServantManager_is_a_paramdata [] =
-{
-  {CORBA::_tc_boolean, 0, 0},
-  {CORBA::_tc_string, CORBA::ARG_IN, 0}
-};
-static const TAO_Call_Data_Skel PortableServer_ServantManager_is_a_calldata =
-{"_is_a", 1, 2, PortableServer_ServantManager_is_a_paramdata};
 void POA_PortableServer::ServantManager::_is_a_skel (
     CORBA::ServerRequest &_tao_server_request,
     void * _tao_object_reference,
@@ -1891,6 +1884,13 @@ void POA_PortableServer::ServantManager::_is_a_skel (
     CORBA::Environment &_tao_environment
   )
 {
+  static const TAO_Param_Data_Skel PortableServer_ServantManager_is_a_paramdata [] =
+  {
+    {CORBA::_tc_boolean, 0, 0},
+    {CORBA::_tc_string, CORBA::ARG_IN, 0}
+  };
+  static const TAO_Call_Data_Skel PortableServer_ServantManager_is_a_calldata =
+  {"_is_a", 1, 2, PortableServer_ServantManager_is_a_paramdata};
   POA_PortableServer::ServantManager_ptr  _tao_impl = (POA_PortableServer::ServantManager_ptr) _tao_object_reference;
   CORBA::Boolean _tao_retval;
   char *_tao_value = 0;
@@ -2005,13 +2005,6 @@ POA_PortableServer::ServantActivator::ServantActivator (void)
   this->optable_ = &tao_PortableServer_ServantActivator_optable;
 }
 
-static const TAO_Param_Data_Skel PortableServer_ServantActivator_is_a_paramdata [] =
-{
-  {CORBA::_tc_boolean, 0, 0},
-  {CORBA::_tc_string, CORBA::ARG_IN, 0}
-};
-static const TAO_Call_Data_Skel PortableServer_ServantActivator_is_a_calldata =
-{"_is_a", 1, 2, PortableServer_ServantActivator_is_a_paramdata};
 void POA_PortableServer::ServantActivator::_is_a_skel (
     CORBA::ServerRequest &_tao_server_request,
     void * _tao_object_reference,
@@ -2019,6 +2012,13 @@ void POA_PortableServer::ServantActivator::_is_a_skel (
     CORBA::Environment &_tao_environment
   )
 {
+  static const TAO_Param_Data_Skel PortableServer_ServantActivator_is_a_paramdata [] =
+  {
+    {CORBA::_tc_boolean, 0, 0},
+    {CORBA::_tc_string, CORBA::ARG_IN, 0}
+  };
+  static const TAO_Call_Data_Skel PortableServer_ServantActivator_is_a_calldata =
+  {"_is_a", 1, 2, PortableServer_ServantActivator_is_a_paramdata};
   POA_PortableServer::ServantActivator_ptr  _tao_impl = (POA_PortableServer::ServantActivator_ptr) _tao_object_reference;
   CORBA::Boolean _tao_retval;
   char *_tao_value = 0;
@@ -2169,13 +2169,6 @@ POA_PortableServer::ServantLocator::ServantLocator (void)
   this->optable_ = &tao_PortableServer_ServantLocator_optable;
 }
 
-static const TAO_Param_Data_Skel PortableServer_ServantLocator_is_a_paramdata [] =
-{
-  {CORBA::_tc_boolean, 0, 0},
-  {CORBA::_tc_string, CORBA::ARG_IN, 0}
-};
-static const TAO_Call_Data_Skel PortableServer_ServantLocator_is_a_calldata =
-{"_is_a", 1, 2, PortableServer_ServantLocator_is_a_paramdata};
 void POA_PortableServer::ServantLocator::_is_a_skel (
     CORBA::ServerRequest &_tao_server_request,
     void * _tao_object_reference,
@@ -2183,6 +2176,13 @@ void POA_PortableServer::ServantLocator::_is_a_skel (
     CORBA::Environment &_tao_environment
   )
 {
+  static const TAO_Param_Data_Skel PortableServer_ServantLocator_is_a_paramdata [] =
+  {
+    {CORBA::_tc_boolean, 0, 0},
+    {CORBA::_tc_string, CORBA::ARG_IN, 0}
+  };
+  static const TAO_Call_Data_Skel PortableServer_ServantLocator_is_a_calldata =
+  {"_is_a", 1, 2, PortableServer_ServantLocator_is_a_paramdata};
   POA_PortableServer::ServantLocator_ptr  _tao_impl = (POA_PortableServer::ServantLocator_ptr) _tao_object_reference;
   CORBA::Boolean _tao_retval;
   char *_tao_value = 0;
@@ -2337,13 +2337,6 @@ POA_PortableServer::POA::POA (void)
   this->optable_ = &tao_PortableServer_POA_optable;
 }
 
-static const TAO_Param_Data_Skel PortableServer_POA_is_a_paramdata [] =
-{
-  {CORBA::_tc_boolean, 0, 0},
-  {CORBA::_tc_string, CORBA::ARG_IN, 0}
-};
-static const TAO_Call_Data_Skel PortableServer_POA_is_a_calldata =
-{"_is_a", 1, 2, PortableServer_POA_is_a_paramdata};
 void POA_PortableServer::POA::_is_a_skel (
     CORBA::ServerRequest &_tao_server_request,
     void * _tao_object_reference,
@@ -2351,6 +2344,13 @@ void POA_PortableServer::POA::_is_a_skel (
     CORBA::Environment &_tao_environment
   )
 {
+  static const TAO_Param_Data_Skel PortableServer_POA_is_a_paramdata [] =
+  {
+    {CORBA::_tc_boolean, 0, 0},
+    {CORBA::_tc_string, CORBA::ARG_IN, 0}
+  };
+  static const TAO_Call_Data_Skel PortableServer_POA_is_a_calldata =
+  {"_is_a", 1, 2, PortableServer_POA_is_a_paramdata};
   POA_PortableServer::POA_ptr  _tao_impl = (POA_PortableServer::POA_ptr) _tao_object_reference;
   CORBA::Boolean _tao_retval;
   char *_tao_value = 0;
@@ -2790,14 +2790,6 @@ POA_PortableServer::Current::Current (void)
   this->optable_ = &tao_PortableServer_Current_optable;
 }
 
-static const TAO_Param_Data_Skel PortableServer_Current_get_POA_paramdata [] =
-{
-  {PortableServer::_tc_POA, 0, 0}
-}; // PortableServer_Current_get_POA_paramdata
-
-static const TAO_Call_Data_Skel PortableServer_Current_get_POA_calldata =
-{"get_POA", 1, 1, PortableServer_Current_get_POA_paramdata};
-
 void POA_PortableServer::Current::get_POA_skel (
     CORBA::ServerRequest &_tao_server_request,
     void *_tao_object_reference,
@@ -2805,6 +2797,14 @@ void POA_PortableServer::Current::get_POA_skel (
     CORBA::Environment &_tao_environment
 )
 {
+  static const TAO_Param_Data_Skel PortableServer_Current_get_POA_paramdata [] =
+  {
+    {PortableServer::_tc_POA, 0, 0}
+  }; // PortableServer_Current_get_POA_paramdata
+
+  static const TAO_Call_Data_Skel PortableServer_Current_get_POA_calldata =
+  {"get_POA", 1, 1, PortableServer_Current_get_POA_paramdata};
+
   POA_PortableServer::Current *_tao_impl = (POA_PortableServer::Current *)_tao_object_reference;
   CORBA::Object_ptr _tao_retval = CORBA::Object::_nil ();
   _tao_server_request.demarshal (
@@ -2823,14 +2823,6 @@ void POA_PortableServer::Current::get_POA_skel (
   );
 }
 
-static const TAO_Param_Data_Skel PortableServer_Current_get_object_id_paramdata [] =
-{
-  {PortableServer::_tc_ObjectId, 0, 0}
-}; // PortableServer_Current_get_object_id_paramdata
-
-static const TAO_Call_Data_Skel PortableServer_Current_get_object_id_calldata =
-{"get_object_id", 1, 1, PortableServer_Current_get_object_id_paramdata};
-
 void POA_PortableServer::Current::get_object_id_skel (
     CORBA::ServerRequest &_tao_server_request,
     void *_tao_object_reference,
@@ -2838,6 +2830,14 @@ void POA_PortableServer::Current::get_object_id_skel (
     CORBA::Environment &_tao_environment
 )
 {
+  static const TAO_Param_Data_Skel PortableServer_Current_get_object_id_paramdata [] =
+  {
+    {PortableServer::_tc_ObjectId, 0, 0}
+  }; // PortableServer_Current_get_object_id_paramdata
+
+  static const TAO_Call_Data_Skel PortableServer_Current_get_object_id_calldata =
+  {"get_object_id", 1, 1, PortableServer_Current_get_object_id_paramdata};
+
   POA_PortableServer::Current *_tao_impl = (POA_PortableServer::Current *)_tao_object_reference;
   PortableServer::ObjectId *_tao_retval = 0;
   _tao_server_request.demarshal (
@@ -2856,13 +2856,6 @@ void POA_PortableServer::Current::get_object_id_skel (
   );
 }
 
-static const TAO_Param_Data_Skel PortableServer_Current_is_a_paramdata [] =
-{
-  {CORBA::_tc_boolean, 0, 0},
-  {CORBA::_tc_string, CORBA::ARG_IN, 0}
-};
-static const TAO_Call_Data_Skel PortableServer_Current_is_a_calldata =
-{"_is_a", 1, 2, PortableServer_Current_is_a_paramdata};
 void POA_PortableServer::Current::_is_a_skel (
     CORBA::ServerRequest &_tao_server_request,
     void * _tao_object_reference,
@@ -2870,6 +2863,13 @@ void POA_PortableServer::Current::_is_a_skel (
     CORBA::Environment &_tao_environment
   )
 {
+  static const TAO_Param_Data_Skel PortableServer_Current_is_a_paramdata [] =
+  {
+    {CORBA::_tc_boolean, 0, 0},
+    {CORBA::_tc_string, CORBA::ARG_IN, 0}
+  };
+  static const TAO_Call_Data_Skel PortableServer_Current_is_a_calldata =
+  {"_is_a", 1, 2, PortableServer_Current_is_a_paramdata};
   POA_PortableServer::Current_ptr  _tao_impl = (POA_PortableServer::Current_ptr) _tao_object_reference;
   CORBA::Boolean _tao_retval;
   char *_tao_value = 0;
diff --git a/TAO/tao/PolicyC.cpp b/TAO/tao/PolicyC.cpp
index 239bb6ad82f..8b8e2e98392 100644
--- a/TAO/tao/PolicyC.cpp
+++ b/TAO/tao/PolicyC.cpp
@@ -66,18 +66,18 @@ CORBA_Policy_ptr CORBA_Policy::_nil (void)
   return (CORBA_Policy_ptr)NULL;
 } // end of _nil
 
-static const TAO_Param_Data _get_CORBA_Policy_policy_type_paramdata [] =
-{
-  {CORBA::_tc_PolicyType, PARAM_RETURN, 0}
-}; // CORBA_Policy_policy_type_paramdata
-
-static const TAO_Call_Data _get_CORBA_Policy_policy_type_calldata =
-{"_get_policy_type", 1, 1, _get_CORBA_Policy_policy_type_paramdata, 0, 0};
-
 CORBA::PolicyType CORBA_Policy::policy_type (
     CORBA::Environment &_tao_environment
    )
 {
+  static const TAO_Param_Data _get_CORBA_Policy_policy_type_paramdata [] =
+  {
+    {CORBA::_tc_PolicyType, PARAM_RETURN, 0}
+  }; // CORBA_Policy_policy_type_paramdata
+
+  static const TAO_Call_Data _get_CORBA_Policy_policy_type_calldata =
+  {"_get_policy_type", 1, 1, _get_CORBA_Policy_policy_type_paramdata, 0, 0};
+
   CORBA::PolicyType _tao_retval = 0;
   STUB_Object *istub = this->stubobj (_tao_environment);
   if (istub)
@@ -91,18 +91,18 @@ CORBA::PolicyType CORBA_Policy::policy_type (
   return _tao_retval;
 }
 
-static const TAO_Param_Data CORBA_Policy_copy_paramdata [] =
-{
-  {CORBA::_tc_Policy, PARAM_RETURN, 0}
-}; // CORBA_Policy_copy_paramdata
-
-static const TAO_Call_Data CORBA_Policy_copy_calldata =
-{"copy", 1, 1, CORBA_Policy_copy_paramdata, 0, 0};
-
 CORBA_Policy_ptr CORBA_Policy::copy (
     CORBA::Environment &_tao_environment
    )
 {
+  static const TAO_Param_Data CORBA_Policy_copy_paramdata [] =
+  {
+    {CORBA::_tc_Policy, PARAM_RETURN, 0}
+  }; // CORBA_Policy_copy_paramdata
+
+  static const TAO_Call_Data CORBA_Policy_copy_calldata =
+  {"copy", 1, 1, CORBA_Policy_copy_paramdata, 0, 0};
+
   CORBA_Policy_ptr _tao_retval = CORBA_Policy::_nil ();
   STUB_Object *istub = this->stubobj (_tao_environment);
   if (istub)
@@ -119,18 +119,18 @@ CORBA_Policy_ptr CORBA_Policy::copy (
   return _tao_retval;
 }
 
-static const TAO_Param_Data CORBA_Policy_destroy_paramdata [] =
-{
-  {CORBA::_tc_void, PARAM_RETURN, 0}
-}; // CORBA_Policy_destroy_paramdata
-
-static const TAO_Call_Data CORBA_Policy_destroy_calldata =
-{"destroy", 1, 1, CORBA_Policy_destroy_paramdata, 0, 0};
-
 void CORBA_Policy::destroy (
     CORBA::Environment &_tao_environment
    )
 {
+  static const TAO_Param_Data CORBA_Policy_destroy_paramdata [] =
+  {
+    {CORBA::_tc_void, PARAM_RETURN, 0}
+  }; // CORBA_Policy_destroy_paramdata
+
+  static const TAO_Call_Data CORBA_Policy_destroy_calldata =
+  {"destroy", 1, 1, CORBA_Policy_destroy_paramdata, 0, 0};
+
   STUB_Object *istub = this->stubobj (_tao_environment);
   if (istub)
   {
diff --git a/TAO/tao/PolicyS.cpp b/TAO/tao/PolicyS.cpp
index 36f2fe27ac0..19b57b38eba 100644
--- a/TAO/tao/PolicyS.cpp
+++ b/TAO/tao/PolicyS.cpp
@@ -36,14 +36,6 @@ POA_CORBA::Policy::Policy (void)
 POA_CORBA::Policy::~Policy (void)
 {
 }
-static const TAO_Param_Data_Skel _get_CORBA_Policy_policy_type_paramdata [] =
-{
-  {CORBA::_tc_PolicyType, 0, 0}
-}; // CORBA_Policy_policy_type_paramdata
-
-static const TAO_Call_Data_Skel _get_CORBA_Policy_policy_type_calldata =
-{"_get_policy_type", 1, 1, _get_CORBA_Policy_policy_type_paramdata};
-
 void POA_CORBA::Policy::_get_policy_type_skel (
     CORBA::ServerRequest &_tao_server_request,
     void *_tao_object_reference,
@@ -51,6 +43,14 @@ void POA_CORBA::Policy::_get_policy_type_skel (
     CORBA::Environment &_tao_environment
 )
 {
+  static const TAO_Param_Data_Skel _get_CORBA_Policy_policy_type_paramdata [] =
+  {
+    {CORBA::_tc_PolicyType, 0, 0}
+  }; // CORBA_Policy_policy_type_paramdata
+
+  static const TAO_Call_Data_Skel _get_CORBA_Policy_policy_type_calldata =
+  {"_get_policy_type", 1, 1, _get_CORBA_Policy_policy_type_paramdata};
+
   POA_CORBA::Policy *_tao_impl = (POA_CORBA::Policy *)_tao_object_reference;
   CORBA::PolicyType _tao_retval = 0;
   _tao_server_request.demarshal (
@@ -69,14 +69,6 @@ void POA_CORBA::Policy::_get_policy_type_skel (
   );
 }
 
-static const TAO_Param_Data_Skel CORBA_Policy_copy_paramdata [] =
-{
-  {CORBA::_tc_Policy, 0, 0}
-}; // CORBA_Policy_copy_paramdata
-
-static const TAO_Call_Data_Skel CORBA_Policy_copy_calldata =
-{"copy", 1, 1, CORBA_Policy_copy_paramdata};
-
 void POA_CORBA::Policy::copy_skel (
     CORBA::ServerRequest &_tao_server_request,
     void *_tao_object_reference,
@@ -84,6 +76,14 @@ void POA_CORBA::Policy::copy_skel (
     CORBA::Environment &_tao_environment
 )
 {
+  static const TAO_Param_Data_Skel CORBA_Policy_copy_paramdata [] =
+  {
+    {CORBA::_tc_Policy, 0, 0}
+  }; // CORBA_Policy_copy_paramdata
+
+  static const TAO_Call_Data_Skel CORBA_Policy_copy_calldata =
+  {"copy", 1, 1, CORBA_Policy_copy_paramdata};
+
   POA_CORBA::Policy *_tao_impl = (POA_CORBA::Policy *)_tao_object_reference;
   CORBA::Object_ptr _tao_retval = CORBA::Object::_nil ();
   _tao_server_request.demarshal (
@@ -102,14 +102,6 @@ void POA_CORBA::Policy::copy_skel (
   );
 }
 
-static const TAO_Param_Data_Skel CORBA_Policy_destroy_paramdata [] =
-{
-  {CORBA::_tc_void, 0, 0}
-}; // CORBA_Policy_destroy_paramdata
-
-static const TAO_Call_Data_Skel CORBA_Policy_destroy_calldata =
-{"destroy", 1, 1, CORBA_Policy_destroy_paramdata};
-
 void POA_CORBA::Policy::destroy_skel (
     CORBA::ServerRequest &_tao_server_request,
     void *_tao_object_reference,
@@ -117,6 +109,14 @@ void POA_CORBA::Policy::destroy_skel (
     CORBA::Environment &_tao_environment
 )
 {
+  static const TAO_Param_Data_Skel CORBA_Policy_destroy_paramdata [] =
+  {
+    {CORBA::_tc_void, 0, 0}
+  }; // CORBA_Policy_destroy_paramdata
+
+  static const TAO_Call_Data_Skel CORBA_Policy_destroy_calldata =
+  {"destroy", 1, 1, CORBA_Policy_destroy_paramdata};
+
   POA_CORBA::Policy *_tao_impl = (POA_CORBA::Policy *)_tao_object_reference;
   _tao_server_request.demarshal (
     _tao_environment,
@@ -134,13 +134,6 @@ void POA_CORBA::Policy::destroy_skel (
   );
 }
 
-static const TAO_Param_Data_Skel CORBA_Policy_is_a_paramdata [] =
-{
-  {CORBA::_tc_boolean, 0, 0},
-  {CORBA::_tc_string, CORBA::ARG_IN, 0}
-};
-static const TAO_Call_Data_Skel CORBA_Policy_is_a_calldata =
-{"_is_a", 1, 2, CORBA_Policy_is_a_paramdata};
 void POA_CORBA::Policy::_is_a_skel (
     CORBA::ServerRequest &_tao_server_request,
     void * _tao_object_reference,
@@ -148,6 +141,13 @@ void POA_CORBA::Policy::_is_a_skel (
     CORBA::Environment &_tao_environment
   )
 {
+  static const TAO_Param_Data_Skel CORBA_Policy_is_a_paramdata [] =
+  {
+    {CORBA::_tc_boolean, 0, 0},
+    {CORBA::_tc_string, CORBA::ARG_IN, 0}
+  };
+  static const TAO_Call_Data_Skel CORBA_Policy_is_a_calldata =
+  {"_is_a", 1, 2, CORBA_Policy_is_a_paramdata};
   POA_CORBA::Policy_ptr  _tao_impl = (POA_CORBA::Policy_ptr) _tao_object_reference;
   CORBA::Boolean _tao_retval;
   char *_tao_value = 0;