ChangeLogTag:Sun Jun 18 03:18:08 2000 Nanbor Wang <nanbor@cs.wustl.edu>

1 files changed, 86 insertions, 87 deletions

diff --git a/TAO/orbsvcs/IFR_Service/TypeCodeFactory_skel.cpp b/TAO/orbsvcs/IFR_Service/TypeCodeFactory_skel.cpp
index f48924b4690..ae8896e9ce5 100644
--- a/TAO/orbsvcs/IFR_Service/TypeCodeFactory_skel.cpp
+++ b/TAO/orbsvcs/IFR_Service/TypeCodeFactory_skel.cpp
@@ -10,7 +10,7 @@
 
 // Since the TypeCode factory needs to be available whether or not
 // the Interface Repository is available, the skeleton code
-// specific to the TypeCode factory (generated by Interface.idl) 
+// specific to the TypeCode factory (generated by Interface.idl)
 // has been separated, removed from the TAO library. and included
 // here.
 
@@ -104,31 +104,31 @@ TAO_CORBA_TypeCodeFactory_Perfect_Hash_OpTable::lookup (const char *str, unsigne
       {"",0},{"",0},{"",0},{"",0},{"",0},
       {"_is_a",  &POA_CORBA::TypeCodeFactory::_is_a_skel},
       {"_non_existent",  &POA_CORBA::TypeCodeFactory::_non_existent_skel},
-      {"create_enum_tc", 	&POA_CORBA::TypeCodeFactory::create_enum_tc_skel},
-      {"create_home_tc", 	&POA_CORBA::TypeCodeFactory::create_home_tc_skel},
-      {"create_union_tc", 	&POA_CORBA::TypeCodeFactory::create_union_tc_skel},
-      {"create_value_tc", 	&POA_CORBA::TypeCodeFactory::create_value_tc_skel},
-      {"create_array_tc", 	&POA_CORBA::TypeCodeFactory::create_array_tc_skel},
-      {"create_fixed_tc", 	&POA_CORBA::TypeCodeFactory::create_fixed_tc_skel},
-      {"create_alias_tc", 	&POA_CORBA::TypeCodeFactory::create_alias_tc_skel},
-      {"create_struct_tc", 	&POA_CORBA::TypeCodeFactory::create_struct_tc_skel},
-      {"create_native_tc", 	&POA_CORBA::TypeCodeFactory::create_native_tc_skel},
-      {"create_string_tc", 	&POA_CORBA::TypeCodeFactory::create_string_tc_skel},
-      {"create_wstring_tc", 	&POA_CORBA::TypeCodeFactory::create_wstring_tc_skel},
-      {"create_sequence_tc", 	&POA_CORBA::TypeCodeFactory::create_sequence_tc_skel},
-      {"create_exception_tc", 	&POA_CORBA::TypeCodeFactory::create_exception_tc_skel},
-      {"create_component_tc", 	&POA_CORBA::TypeCodeFactory::create_component_tc_skel},
-      {"create_recursive_tc", 	&POA_CORBA::TypeCodeFactory::create_recursive_tc_skel},
-      {"create_value_box_tc", 	&POA_CORBA::TypeCodeFactory::create_value_box_tc_skel},
-      {"create_interface_tc", 	&POA_CORBA::TypeCodeFactory::create_interface_tc_skel},
-      {"create_abstract_interface_tc", 	&POA_CORBA::TypeCodeFactory::create_abstract_interface_tc_skel},
+      {"create_enum_tc",        &POA_CORBA::TypeCodeFactory::create_enum_tc_skel},
+      {"create_home_tc",        &POA_CORBA::TypeCodeFactory::create_home_tc_skel},
+      {"create_union_tc",       &POA_CORBA::TypeCodeFactory::create_union_tc_skel},
+      {"create_value_tc",       &POA_CORBA::TypeCodeFactory::create_value_tc_skel},
+      {"create_array_tc",       &POA_CORBA::TypeCodeFactory::create_array_tc_skel},
+      {"create_fixed_tc",       &POA_CORBA::TypeCodeFactory::create_fixed_tc_skel},
+      {"create_alias_tc",       &POA_CORBA::TypeCodeFactory::create_alias_tc_skel},
+      {"create_struct_tc",      &POA_CORBA::TypeCodeFactory::create_struct_tc_skel},
+      {"create_native_tc",      &POA_CORBA::TypeCodeFactory::create_native_tc_skel},
+      {"create_string_tc",      &POA_CORBA::TypeCodeFactory::create_string_tc_skel},
+      {"create_wstring_tc",     &POA_CORBA::TypeCodeFactory::create_wstring_tc_skel},
+      {"create_sequence_tc",    &POA_CORBA::TypeCodeFactory::create_sequence_tc_skel},
+      {"create_exception_tc",   &POA_CORBA::TypeCodeFactory::create_exception_tc_skel},
+      {"create_component_tc",   &POA_CORBA::TypeCodeFactory::create_component_tc_skel},
+      {"create_recursive_tc",   &POA_CORBA::TypeCodeFactory::create_recursive_tc_skel},
+      {"create_value_box_tc",   &POA_CORBA::TypeCodeFactory::create_value_box_tc_skel},
+      {"create_interface_tc",   &POA_CORBA::TypeCodeFactory::create_interface_tc_skel},
+      {"create_abstract_interface_tc",  &POA_CORBA::TypeCodeFactory::create_abstract_interface_tc_skel},
     };
 
   static const signed char lookup[] =
     {
-       -1,  -1,  -1,  -7,  -2,   5,  -1,  -9,  -5, -14,  -3, -19,  -5,   6, 
-      -39, -36, -35,  17,  18, -36,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1, 
-       24, 
+       -1,  -1,  -1,  -7,  -2,   5,  -1,  -9,  -5, -14,  -3, -19,  -5,   6,
+      -39, -36, -35,  17,  18, -36,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+       24,
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -170,7 +170,7 @@ CORBA::TypeCodeFactory_ptr _TAO_collocation_POA_CORBA_TypeCodeFactory_Stub_Facto
   )
 {
   TAO_Stub *stub = obj->_stubobj ();
-  
+
   switch (stub->servant_orb_var ()->orb_core ()->get_collocation_strategy ())
     {
     case TAO_ORB_Core::THRU_POA:
@@ -194,14 +194,14 @@ CORBA::TypeCodeFactory_ptr _TAO_collocation_POA_CORBA_TypeCodeFactory_Stub_Facto
 int _TAO_collocation_POA_CORBA_TypeCodeFactory_Stub_Factory_Initializer (long dummy)
 {
   ACE_UNUSED_ARG (dummy);
-  
-  _TAO_collocation_CORBA_TypeCodeFactory_Stub_Factory_function_pointer = 
+
+  _TAO_collocation_CORBA_TypeCodeFactory_Stub_Factory_function_pointer =
     _TAO_collocation_POA_CORBA_TypeCodeFactory_Stub_Factory;
-  
+
   return 0;
 }
 
-static int _TAO_collocation_POA_CORBA_TypeCodeFactory_Stub_Factory_Initializer_Scarecrow = 
+static int _TAO_collocation_POA_CORBA_TypeCodeFactory_Stub_Factory_Initializer_Scarecrow =
   _TAO_collocation_POA_CORBA_TypeCodeFactory_Stub_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_collocation_POA_CORBA_TypeCodeFactory_Stub_Factory_Initializer));
 
 // skeleton constructor
@@ -222,8 +222,8 @@ POA_CORBA::TypeCodeFactory::~TypeCodeFactory (void)
 
 void POA_CORBA::TypeCodeFactory::create_struct_tc_skel (
     CORBA::ServerRequest &_tao_server_request,
-    void *_tao_object_reference, 
-    void * /* context */, 
+    void *_tao_object_reference,
+    void * /* context */,
     CORBA::Environment &ACE_TRY_ENV
 )
 {
@@ -304,7 +304,7 @@ void POA_CORBA::TypeCodeFactory::create_struct_tc_skel (
           _tao_cookies,
           ACE_TRY_ENV
         );
-      ACE_RETHROW;
+      ACE_RE_THROW;
     }
   ACE_ENDTRY;
   ACE_CHECK;
@@ -322,8 +322,8 @@ void POA_CORBA::TypeCodeFactory::create_struct_tc_skel (
 
 void POA_CORBA::TypeCodeFactory::create_union_tc_skel (
     CORBA::ServerRequest &_tao_server_request,
-    void *_tao_object_reference, 
-    void * /* context */, 
+    void *_tao_object_reference,
+    void * /* context */,
     CORBA::Environment &ACE_TRY_ENV
 )
 {
@@ -407,7 +407,7 @@ void POA_CORBA::TypeCodeFactory::create_union_tc_skel (
           _tao_cookies,
           ACE_TRY_ENV
         );
-      ACE_RETHROW;
+      ACE_RE_THROW;
     }
   ACE_ENDTRY;
   ACE_CHECK;
@@ -425,8 +425,8 @@ void POA_CORBA::TypeCodeFactory::create_union_tc_skel (
 
 void POA_CORBA::TypeCodeFactory::create_enum_tc_skel (
     CORBA::ServerRequest &_tao_server_request,
-    void *_tao_object_reference, 
-    void * /* context */, 
+    void *_tao_object_reference,
+    void * /* context */,
     CORBA::Environment &ACE_TRY_ENV
 )
 {
@@ -507,7 +507,7 @@ void POA_CORBA::TypeCodeFactory::create_enum_tc_skel (
           _tao_cookies,
           ACE_TRY_ENV
         );
-      ACE_RETHROW;
+      ACE_RE_THROW;
     }
   ACE_ENDTRY;
   ACE_CHECK;
@@ -525,8 +525,8 @@ void POA_CORBA::TypeCodeFactory::create_enum_tc_skel (
 
 void POA_CORBA::TypeCodeFactory::create_alias_tc_skel (
     CORBA::ServerRequest &_tao_server_request,
-    void *_tao_object_reference, 
-    void * /* context */, 
+    void *_tao_object_reference,
+    void * /* context */,
     CORBA::Environment &ACE_TRY_ENV
 )
 {
@@ -607,7 +607,7 @@ void POA_CORBA::TypeCodeFactory::create_alias_tc_skel (
           _tao_cookies,
           ACE_TRY_ENV
         );
-      ACE_RETHROW;
+      ACE_RE_THROW;
     }
   ACE_ENDTRY;
   ACE_CHECK;
@@ -625,8 +625,8 @@ void POA_CORBA::TypeCodeFactory::create_alias_tc_skel (
 
 void POA_CORBA::TypeCodeFactory::create_exception_tc_skel (
     CORBA::ServerRequest &_tao_server_request,
-    void *_tao_object_reference, 
-    void * /* context */, 
+    void *_tao_object_reference,
+    void * /* context */,
     CORBA::Environment &ACE_TRY_ENV
 )
 {
@@ -707,7 +707,7 @@ void POA_CORBA::TypeCodeFactory::create_exception_tc_skel (
           _tao_cookies,
           ACE_TRY_ENV
         );
-      ACE_RETHROW;
+      ACE_RE_THROW;
     }
   ACE_ENDTRY;
   ACE_CHECK;
@@ -725,8 +725,8 @@ void POA_CORBA::TypeCodeFactory::create_exception_tc_skel (
 
 void POA_CORBA::TypeCodeFactory::create_interface_tc_skel (
     CORBA::ServerRequest &_tao_server_request,
-    void *_tao_object_reference, 
-    void * /* context */, 
+    void *_tao_object_reference,
+    void * /* context */,
     CORBA::Environment &ACE_TRY_ENV
 )
 {
@@ -804,7 +804,7 @@ void POA_CORBA::TypeCodeFactory::create_interface_tc_skel (
           _tao_cookies,
           ACE_TRY_ENV
         );
-      ACE_RETHROW;
+      ACE_RE_THROW;
     }
   ACE_ENDTRY;
   ACE_CHECK;
@@ -822,8 +822,8 @@ void POA_CORBA::TypeCodeFactory::create_interface_tc_skel (
 
 void POA_CORBA::TypeCodeFactory::create_string_tc_skel (
     CORBA::ServerRequest &_tao_server_request,
-    void *_tao_object_reference, 
-    void * /* context */, 
+    void *_tao_object_reference,
+    void * /* context */,
     CORBA::Environment &ACE_TRY_ENV
 )
 {
@@ -898,7 +898,7 @@ void POA_CORBA::TypeCodeFactory::create_string_tc_skel (
           _tao_cookies,
           ACE_TRY_ENV
         );
-      ACE_RETHROW;
+      ACE_RE_THROW;
     }
   ACE_ENDTRY;
   ACE_CHECK;
@@ -916,8 +916,8 @@ void POA_CORBA::TypeCodeFactory::create_string_tc_skel (
 
 void POA_CORBA::TypeCodeFactory::create_wstring_tc_skel (
     CORBA::ServerRequest &_tao_server_request,
-    void *_tao_object_reference, 
-    void * /* context */, 
+    void *_tao_object_reference,
+    void * /* context */,
     CORBA::Environment &ACE_TRY_ENV
 )
 {
@@ -992,7 +992,7 @@ void POA_CORBA::TypeCodeFactory::create_wstring_tc_skel (
           _tao_cookies,
           ACE_TRY_ENV
         );
-      ACE_RETHROW;
+      ACE_RE_THROW;
     }
   ACE_ENDTRY;
   ACE_CHECK;
@@ -1010,8 +1010,8 @@ void POA_CORBA::TypeCodeFactory::create_wstring_tc_skel (
 
 void POA_CORBA::TypeCodeFactory::create_fixed_tc_skel (
     CORBA::ServerRequest &_tao_server_request,
-    void *_tao_object_reference, 
-    void * /* context */, 
+    void *_tao_object_reference,
+    void * /* context */,
     CORBA::Environment &ACE_TRY_ENV
 )
 {
@@ -1089,7 +1089,7 @@ void POA_CORBA::TypeCodeFactory::create_fixed_tc_skel (
           _tao_cookies,
           ACE_TRY_ENV
         );
-      ACE_RETHROW;
+      ACE_RE_THROW;
     }
   ACE_ENDTRY;
   ACE_CHECK;
@@ -1107,8 +1107,8 @@ void POA_CORBA::TypeCodeFactory::create_fixed_tc_skel (
 
 void POA_CORBA::TypeCodeFactory::create_sequence_tc_skel (
     CORBA::ServerRequest &_tao_server_request,
-    void *_tao_object_reference, 
-    void * /* context */, 
+    void *_tao_object_reference,
+    void * /* context */,
     CORBA::Environment &ACE_TRY_ENV
 )
 {
@@ -1186,7 +1186,7 @@ void POA_CORBA::TypeCodeFactory::create_sequence_tc_skel (
           _tao_cookies,
           ACE_TRY_ENV
         );
-      ACE_RETHROW;
+      ACE_RE_THROW;
     }
   ACE_ENDTRY;
   ACE_CHECK;
@@ -1204,8 +1204,8 @@ void POA_CORBA::TypeCodeFactory::create_sequence_tc_skel (
 
 void POA_CORBA::TypeCodeFactory::create_array_tc_skel (
     CORBA::ServerRequest &_tao_server_request,
-    void *_tao_object_reference, 
-    void * /* context */, 
+    void *_tao_object_reference,
+    void * /* context */,
     CORBA::Environment &ACE_TRY_ENV
 )
 {
@@ -1283,7 +1283,7 @@ void POA_CORBA::TypeCodeFactory::create_array_tc_skel (
           _tao_cookies,
           ACE_TRY_ENV
         );
-      ACE_RETHROW;
+      ACE_RE_THROW;
     }
   ACE_ENDTRY;
   ACE_CHECK;
@@ -1301,8 +1301,8 @@ void POA_CORBA::TypeCodeFactory::create_array_tc_skel (
 
 void POA_CORBA::TypeCodeFactory::create_value_tc_skel (
     CORBA::ServerRequest &_tao_server_request,
-    void *_tao_object_reference, 
-    void * /* context */, 
+    void *_tao_object_reference,
+    void * /* context */,
     CORBA::Environment &ACE_TRY_ENV
 )
 {
@@ -1389,7 +1389,7 @@ void POA_CORBA::TypeCodeFactory::create_value_tc_skel (
           _tao_cookies,
           ACE_TRY_ENV
         );
-      ACE_RETHROW;
+      ACE_RE_THROW;
     }
   ACE_ENDTRY;
   ACE_CHECK;
@@ -1407,8 +1407,8 @@ void POA_CORBA::TypeCodeFactory::create_value_tc_skel (
 
 void POA_CORBA::TypeCodeFactory::create_value_box_tc_skel (
     CORBA::ServerRequest &_tao_server_request,
-    void *_tao_object_reference, 
-    void * /* context */, 
+    void *_tao_object_reference,
+    void * /* context */,
     CORBA::Environment &ACE_TRY_ENV
 )
 {
@@ -1489,7 +1489,7 @@ void POA_CORBA::TypeCodeFactory::create_value_box_tc_skel (
           _tao_cookies,
           ACE_TRY_ENV
         );
-      ACE_RETHROW;
+      ACE_RE_THROW;
     }
   ACE_ENDTRY;
   ACE_CHECK;
@@ -1507,8 +1507,8 @@ void POA_CORBA::TypeCodeFactory::create_value_box_tc_skel (
 
 void POA_CORBA::TypeCodeFactory::create_native_tc_skel (
     CORBA::ServerRequest &_tao_server_request,
-    void *_tao_object_reference, 
-    void * /* context */, 
+    void *_tao_object_reference,
+    void * /* context */,
     CORBA::Environment &ACE_TRY_ENV
 )
 {
@@ -1586,7 +1586,7 @@ void POA_CORBA::TypeCodeFactory::create_native_tc_skel (
           _tao_cookies,
           ACE_TRY_ENV
         );
-      ACE_RETHROW;
+      ACE_RE_THROW;
     }
   ACE_ENDTRY;
   ACE_CHECK;
@@ -1604,8 +1604,8 @@ void POA_CORBA::TypeCodeFactory::create_native_tc_skel (
 
 void POA_CORBA::TypeCodeFactory::create_recursive_tc_skel (
     CORBA::ServerRequest &_tao_server_request,
-    void *_tao_object_reference, 
-    void * /* context */, 
+    void *_tao_object_reference,
+    void * /* context */,
     CORBA::Environment &ACE_TRY_ENV
 )
 {
@@ -1680,7 +1680,7 @@ void POA_CORBA::TypeCodeFactory::create_recursive_tc_skel (
           _tao_cookies,
           ACE_TRY_ENV
         );
-      ACE_RETHROW;
+      ACE_RE_THROW;
     }
   ACE_ENDTRY;
   ACE_CHECK;
@@ -1698,8 +1698,8 @@ void POA_CORBA::TypeCodeFactory::create_recursive_tc_skel (
 
 void POA_CORBA::TypeCodeFactory::create_abstract_interface_tc_skel (
     CORBA::ServerRequest &_tao_server_request,
-    void *_tao_object_reference, 
-    void * /* context */, 
+    void *_tao_object_reference,
+    void * /* context */,
     CORBA::Environment &ACE_TRY_ENV
 )
 {
@@ -1777,7 +1777,7 @@ void POA_CORBA::TypeCodeFactory::create_abstract_interface_tc_skel (
           _tao_cookies,
           ACE_TRY_ENV
         );
-      ACE_RETHROW;
+      ACE_RE_THROW;
     }
   ACE_ENDTRY;
   ACE_CHECK;
@@ -1795,8 +1795,8 @@ void POA_CORBA::TypeCodeFactory::create_abstract_interface_tc_skel (
 
 void POA_CORBA::TypeCodeFactory::create_component_tc_skel (
     CORBA::ServerRequest &_tao_server_request,
-    void *_tao_object_reference, 
-    void * /* context */, 
+    void *_tao_object_reference,
+    void * /* context */,
     CORBA::Environment &ACE_TRY_ENV
 )
 {
@@ -1874,7 +1874,7 @@ void POA_CORBA::TypeCodeFactory::create_component_tc_skel (
           _tao_cookies,
           ACE_TRY_ENV
         );
-      ACE_RETHROW;
+      ACE_RE_THROW;
     }
   ACE_ENDTRY;
   ACE_CHECK;
@@ -1892,8 +1892,8 @@ void POA_CORBA::TypeCodeFactory::create_component_tc_skel (
 
 void POA_CORBA::TypeCodeFactory::create_home_tc_skel (
     CORBA::ServerRequest &_tao_server_request,
-    void *_tao_object_reference, 
-    void * /* context */, 
+    void *_tao_object_reference,
+    void * /* context */,
     CORBA::Environment &ACE_TRY_ENV
 )
 {
@@ -1971,7 +1971,7 @@ void POA_CORBA::TypeCodeFactory::create_home_tc_skel (
           _tao_cookies,
           ACE_TRY_ENV
         );
-      ACE_RETHROW;
+      ACE_RE_THROW;
     }
   ACE_ENDTRY;
   ACE_CHECK;
@@ -1988,7 +1988,7 @@ void POA_CORBA::TypeCodeFactory::create_home_tc_skel (
 }
 
 void POA_CORBA::TypeCodeFactory::_is_a_skel (
-    CORBA::ServerRequest &_tao_server_request, 
+    CORBA::ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* context */,
     CORBA::Environment &ACE_TRY_ENV
@@ -2000,10 +2000,10 @@ void POA_CORBA::TypeCodeFactory::_is_a_skel (
   CORBA::String_var value;
   if (!((_tao_in >> value.out ())))
     ACE_THROW (CORBA::MARSHAL ());
-  
+
   _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
   ACE_CHECK;
-  
+
   _tao_server_request.init_reply (ACE_TRY_ENV);
   ACE_CHECK;
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
@@ -2012,7 +2012,7 @@ void POA_CORBA::TypeCodeFactory::_is_a_skel (
 }
 
 void POA_CORBA::TypeCodeFactory::_non_existent_skel (
-    CORBA::ServerRequest &_tao_server_request, 
+    CORBA::ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* context */,
     CORBA::Environment &ACE_TRY_ENV
@@ -2021,7 +2021,7 @@ void POA_CORBA::TypeCodeFactory::_non_existent_skel (
   POA_CORBA::TypeCodeFactory *_tao_impl = (POA_CORBA::TypeCodeFactory *) _tao_object_reference;
   CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
   ACE_CHECK;
-  
+
   _tao_server_request.init_reply (ACE_TRY_ENV);
   ACE_CHECK;
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
@@ -2766,4 +2766,3 @@ CORBA::TypeCode_ptr POA_CORBA::_tao_thru_poa_collocated_TypeCodeFactory::create_
     );
 
 }
-