ChangeLogTag: Fri Mar 4 10:01:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

10 files changed, 260 insertions, 234 deletions

diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp
index 980cadc0b93..5c532029232 100644
--- a/TAO/TAO_IDL/be/be_codegen.cpp
+++ b/TAO/TAO_IDL/be/be_codegen.cpp
@@ -198,7 +198,7 @@ TAO_CodeGen::start_client_header (const char *fname)
     {
       *this->client_header_ << "\n";
     }
-    
+
   // We must include all the client headers corresponding to
   // IDL files included by the current IDL file.
   // We will use the included IDL file names as they appeared
@@ -1600,11 +1600,37 @@ TAO_CodeGen::gen_skel_src_includes (void)
       return;
     }
 
+  switch (be_global->lookup_strategy ())
+    {
+      case BE_GlobalData::TAO_DYNAMIC_HASH:
+        {
+          this->gen_standard_include (this->server_skeletons_,
+                                      "tao/PortableServer/Operation_Table_Dynamic_Hash.h");
+        }
+        break;
+      case BE_GlobalData::TAO_LINEAR_SEARCH:
+        {
+          this->gen_standard_include (this->server_skeletons_,
+                                      "tao/PortableServer/Operation_Table_Linear_Search.h");
+        }
+        break;
+      case BE_GlobalData::TAO_BINARY_SEARCH:
+        {
+          this->gen_standard_include (this->server_skeletons_,
+                                      "tao/PortableServer/Operation_Table_Binary_Search.h");
+        }
+        break;
+      case BE_GlobalData::TAO_PERFECT_HASH:
+        {
+          this->gen_standard_include (this->server_skeletons_,
+                                      "tao/PortableServer/Operation_Table_Perfect_Hash.h");
+        }
+        break;
+    }
+
   this->gen_standard_include (this->server_skeletons_,
                               "tao/PortableServer/ForwardRequestC.h");
   this->gen_standard_include (this->server_skeletons_,
-                              "tao/PortableServer/Operation_Table.h");
-  this->gen_standard_include (this->server_skeletons_,
                               "tao/PortableServer/Upcall_Command.h");
   this->gen_standard_include (this->server_skeletons_,
                               "tao/PortableServer/Upcall_Wrapper.h");
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.cpp
index b4e07ad3f01..8290dafee8f 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_codegen.cpp:609
 
 #ifndef _TAO_IDL_ORIG_IFR_BASES_CPP_
@@ -35,7 +35,7 @@
 
 #include "IFR_BaseS.h"
 #include "tao/PortableServer/ForwardRequestC.h"
-#include "tao/PortableServer/Operation_Table.h"
+#include "tao/PortableServer/Operation_Table_Perfect_Hash.h"
 #include "tao/PortableServer/Upcall_Command.h"
 #include "tao/PortableServer/Upcall_Wrapper.h"
 #include "tao/PortableServer/Basic_SArguments.h"
@@ -82,13 +82,13 @@
 // Arg traits specializations.
 namespace TAO
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:702
 
 #if !defined (_CORBA_DEFINITIONKIND__SARG_TRAITS_SS_)
 #define _CORBA_DEFINITIONKIND__SARG_TRAITS_SS_
-  
+
   template<>
   class TAO_IFR_Client_Export SArg_Traits<CORBA::DefinitionKind>
     : public
@@ -102,7 +102,7 @@ namespace TAO
 
 #if !defined (_CORBA_CONTAINED__SARG_TRAITS_SS_)
 #define _CORBA_CONTAINED__SARG_TRAITS_SS_
-  
+
   template<>
   class  SArg_Traits<CORBA::Contained>
     : public
@@ -115,13 +115,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:743
 
 #if !defined (_CORBA_CONTAINED_DESCRIPTION__SARG_TRAITS_SS_)
 #define _CORBA_CONTAINED_DESCRIPTION__SARG_TRAITS_SS_
-  
+
   template<>
   class TAO_IFR_Client_Export SArg_Traits<CORBA::Contained::Description>
     : public
@@ -137,7 +137,7 @@ namespace TAO
 
 #if !defined (_CORBA_REPOSITORY__SARG_TRAITS_SS_)
 #define _CORBA_REPOSITORY__SARG_TRAITS_SS_
-  
+
   template<>
   class  SArg_Traits<CORBA::Repository>
     : public
@@ -153,7 +153,7 @@ namespace TAO
 
 #if !defined (_CORBA_CONTAINER__SARG_TRAITS_SS_)
 #define _CORBA_CONTAINER__SARG_TRAITS_SS_
-  
+
   template<>
   class  SArg_Traits<CORBA::Container>
     : public
@@ -166,13 +166,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:492
 
 #if !defined (_CORBA_CONTAINER_DESCRIPTIONSEQ__SARG_TRAITS_SS_)
 #define _CORBA_CONTAINER_DESCRIPTIONSEQ__SARG_TRAITS_SS_
-  
+
   template<>
   class TAO_IFR_Client_Export SArg_Traits<CORBA::Container::DescriptionSeq>
     : public
@@ -188,7 +188,7 @@ namespace TAO
 
 #if !defined (_CORBA_MODULEDEF__SARG_TRAITS_SS_)
 #define _CORBA_MODULEDEF__SARG_TRAITS_SS_
-  
+
   template<>
   class  SArg_Traits<CORBA::ModuleDef>
     : public
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.cpp
index df72133815c..3413f1bc29b 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_codegen.cpp:609
 
 #ifndef _TAO_IDL_ORIG_IFR_BASICS_CPP_
@@ -35,7 +35,7 @@
 
 #include "IFR_BasicS.h"
 #include "tao/PortableServer/ForwardRequestC.h"
-#include "tao/PortableServer/Operation_Table.h"
+#include "tao/PortableServer/Operation_Table_Perfect_Hash.h"
 #include "tao/PortableServer/Upcall_Command.h"
 #include "tao/PortableServer/Upcall_Wrapper.h"
 #include "tao/PortableServer/Basic_SArguments.h"
@@ -82,13 +82,13 @@
 // Arg traits specializations.
 namespace TAO
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:702
 
 #if !defined (_CORBA_DEFINITIONKIND__SARG_TRAITS_SS_)
 #define _CORBA_DEFINITIONKIND__SARG_TRAITS_SS_
-  
+
   template<>
   class TAO_IFR_Client_Export SArg_Traits<CORBA::DefinitionKind>
     : public
@@ -102,7 +102,7 @@ namespace TAO
 
 #if !defined (_CORBA_CONTAINED__SARG_TRAITS_SS_)
 #define _CORBA_CONTAINED__SARG_TRAITS_SS_
-  
+
   template<>
   class  SArg_Traits<CORBA::Contained>
     : public
@@ -118,7 +118,7 @@ namespace TAO
 
 #if !defined (_CORBA_REPOSITORY__SARG_TRAITS_SS_)
 #define _CORBA_REPOSITORY__SARG_TRAITS_SS_
-  
+
   template<>
   class  SArg_Traits<CORBA::Repository>
     : public
@@ -134,7 +134,7 @@ namespace TAO
 
 #if !defined (_CORBA_CONTAINER__SARG_TRAITS_SS_)
 #define _CORBA_CONTAINER__SARG_TRAITS_SS_
-  
+
   template<>
   class  SArg_Traits<CORBA::Container>
     : public
@@ -150,7 +150,7 @@ namespace TAO
 
 #if !defined (_CORBA_IDLTYPE__SARG_TRAITS_SS_)
 #define _CORBA_IDLTYPE__SARG_TRAITS_SS_
-  
+
   template<>
   class  SArg_Traits<CORBA::IDLType>
     : public
@@ -163,13 +163,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:743
 
 #if !defined (_CORBA_INTERFACEDEF_FULLINTERFACEDESCRIPTION__SARG_TRAITS_SS_)
 #define _CORBA_INTERFACEDEF_FULLINTERFACEDESCRIPTION__SARG_TRAITS_SS_
-  
+
   template<>
   class TAO_IFR_Client_Export SArg_Traits<CORBA::InterfaceDef::FullInterfaceDescription>
     : public
@@ -182,13 +182,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:492
 
 #if !defined (_CORBA_INTERFACEDEFSEQ__SARG_TRAITS_SS_)
 #define _CORBA_INTERFACEDEFSEQ__SARG_TRAITS_SS_
-  
+
   template<>
   class TAO_IFR_Client_Export SArg_Traits<CORBA::InterfaceDefSeq>
     : public
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.cpp
index df38a645281..85ce1cdcd79 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_codegen.cpp:609
 
 #ifndef _TAO_IDL_ORIG_IFR_COMPONENTSS_CPP_
@@ -35,7 +35,7 @@
 
 #include "IFR_ComponentsS.h"
 #include "tao/PortableServer/ForwardRequestC.h"
-#include "tao/PortableServer/Operation_Table.h"
+#include "tao/PortableServer/Operation_Table_Perfect_Hash.h"
 #include "tao/PortableServer/Upcall_Command.h"
 #include "tao/PortableServer/Upcall_Wrapper.h"
 #include "tao/PortableServer/Basic_SArguments.h"
@@ -80,13 +80,13 @@
 // Arg traits specializations.
 namespace TAO
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:702
 
 #if !defined (_CORBA_DEFINITIONKIND__SARG_TRAITS_SS_)
 #define _CORBA_DEFINITIONKIND__SARG_TRAITS_SS_
-  
+
   template<>
   class TAO_IFR_Client_Export SArg_Traits<CORBA::DefinitionKind>
     : public
@@ -100,7 +100,7 @@ namespace TAO
 
 #if !defined (_CORBA_REPOSITORY__SARG_TRAITS_SS_)
 #define _CORBA_REPOSITORY__SARG_TRAITS_SS_
-  
+
   template<>
   class  SArg_Traits<CORBA::Repository>
     : public
@@ -116,7 +116,7 @@ namespace TAO
 
 #if !defined (_CORBA_CONTAINER__SARG_TRAITS_SS_)
 #define _CORBA_CONTAINER__SARG_TRAITS_SS_
-  
+
   template<>
   class  SArg_Traits<CORBA::Container>
     : public
@@ -132,7 +132,7 @@ namespace TAO
 
 #if !defined (_CORBA_IDLTYPE__SARG_TRAITS_SS_)
 #define _CORBA_IDLTYPE__SARG_TRAITS_SS_
-  
+
   template<>
   class  SArg_Traits<CORBA::IDLType>
     : public
@@ -148,7 +148,7 @@ namespace TAO
 
 #if !defined (_CORBA_INTERFACEDEF__SARG_TRAITS_SS_)
 #define _CORBA_INTERFACEDEF__SARG_TRAITS_SS_
-  
+
   template<>
   class  SArg_Traits<CORBA::InterfaceDef>
     : public
@@ -161,13 +161,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:492
 
 #if !defined (_CORBA_INTERFACEDEFSEQ__SARG_TRAITS_SS_)
 #define _CORBA_INTERFACEDEFSEQ__SARG_TRAITS_SS_
-  
+
   template<>
   class TAO_IFR_Client_Export SArg_Traits<CORBA::InterfaceDefSeq>
     : public
@@ -183,7 +183,7 @@ namespace TAO
 
 #if !defined (_CORBA_VALUEDEF__SARG_TRAITS_SS_)
 #define _CORBA_VALUEDEF__SARG_TRAITS_SS_
-  
+
   template<>
   class  SArg_Traits<CORBA::ValueDef>
     : public
@@ -196,7 +196,7 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:492
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.cpp
index 75672070a35..202fad16dd1 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_codegen.cpp:609
 
 #ifndef _TAO_IDL_ORIG_IFR_EXTENDEDS_CPP_
@@ -35,7 +35,7 @@
 
 #include "IFR_ExtendedS.h"
 #include "tao/PortableServer/ForwardRequestC.h"
-#include "tao/PortableServer/Operation_Table.h"
+#include "tao/PortableServer/Operation_Table_Perfect_Hash.h"
 #include "tao/PortableServer/Upcall_Command.h"
 #include "tao/PortableServer/Upcall_Wrapper.h"
 #include "tao/PortableServer/Basic_SArguments.h"
@@ -80,13 +80,13 @@
 // Arg traits specializations.
 namespace TAO
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:702
 
 #if !defined (_CORBA_DEFINITIONKIND__SARG_TRAITS_SS_)
 #define _CORBA_DEFINITIONKIND__SARG_TRAITS_SS_
-  
+
   template<>
   class TAO_IFR_Client_Export SArg_Traits<CORBA::DefinitionKind>
     : public
@@ -100,7 +100,7 @@ namespace TAO
 
 #if !defined (_CORBA_REPOSITORY__SARG_TRAITS_SS_)
 #define _CORBA_REPOSITORY__SARG_TRAITS_SS_
-  
+
   template<>
   class  SArg_Traits<CORBA::Repository>
     : public
@@ -116,7 +116,7 @@ namespace TAO
 
 #if !defined (_CORBA_CONTAINER__SARG_TRAITS_SS_)
 #define _CORBA_CONTAINER__SARG_TRAITS_SS_
-  
+
   template<>
   class  SArg_Traits<CORBA::Container>
     : public
@@ -132,7 +132,7 @@ namespace TAO
 
 #if !defined (_CORBA_IDLTYPE__SARG_TRAITS_SS_)
 #define _CORBA_IDLTYPE__SARG_TRAITS_SS_
-  
+
   template<>
   class  SArg_Traits<CORBA::IDLType>
     : public
@@ -145,13 +145,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:492
 
 #if !defined (_CORBA_INTERFACEDEFSEQ__SARG_TRAITS_SS_)
 #define _CORBA_INTERFACEDEFSEQ__SARG_TRAITS_SS_
-  
+
   template<>
   class TAO_IFR_Client_Export SArg_Traits<CORBA::InterfaceDefSeq>
     : public
@@ -167,7 +167,7 @@ namespace TAO
 
 #if !defined (_CORBA_VALUEDEF__SARG_TRAITS_SS_)
 #define _CORBA_VALUEDEF__SARG_TRAITS_SS_
-  
+
   template<>
   class  SArg_Traits<CORBA::ValueDef>
     : public
@@ -180,13 +180,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:743
 
 #if !defined (_CORBA_VALUEDEF_FULLVALUEDESCRIPTION__SARG_TRAITS_SS_)
 #define _CORBA_VALUEDEF_FULLVALUEDESCRIPTION__SARG_TRAITS_SS_
-  
+
   template<>
   class TAO_IFR_Client_Export SArg_Traits<CORBA::ValueDef::FullValueDescription>
     : public
diff --git a/TAO/tao/Domain/DomainS.cpp b/TAO/tao/Domain/DomainS.cpp
index df110c06db5..ad0b1166bdc 100644
--- a/TAO/tao/Domain/DomainS.cpp
+++ b/TAO/tao/Domain/DomainS.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_codegen.cpp:609
 
 #ifndef _TAO_IDL_ORIG_DOMAINS_CPP_
@@ -35,7 +35,7 @@
 
 #include "DomainS.h"
 #include "tao/PortableServer/ForwardRequestC.h"
-#include "tao/PortableServer/Operation_Table.h"
+#include "tao/PortableServer/Operation_Table_Perfect_Hash.h"
 #include "tao/PortableServer/Upcall_Command.h"
 #include "tao/PortableServer/Upcall_Wrapper.h"
 #include "tao/PortableServer/Basic_SArguments.h"
@@ -80,7 +80,7 @@ namespace TAO
 
 #if !defined (_CORBA_POLICY__SARG_TRAITS_SS_)
 #define _CORBA_POLICY__SARG_TRAITS_SS_
-  
+
   template<>
   class TAO_Domain_Export SArg_Traits<CORBA::Policy>
     : public
@@ -96,7 +96,7 @@ namespace TAO
 
 #if !defined (_CORBA_INTERFACEDEF__SARG_TRAITS_SS_)
 #define _CORBA_INTERFACEDEF__SARG_TRAITS_SS_
-  
+
   template<>
   class TAO_Domain_Export SArg_Traits<CORBA::InterfaceDef>
     : public
@@ -121,7 +121,7 @@ namespace TAO
 
 #if !defined (_CORBA_POLICY__ARG_TRAITS_SS_)
 #define _CORBA_POLICY__ARG_TRAITS_SS_
-  
+
   template<>
   class TAO_Domain_Export Arg_Traits<CORBA::Policy>
     : public
@@ -138,7 +138,7 @@ namespace TAO
 
 #if !defined (_CORBA_INTERFACEDEF__ARG_TRAITS_SS_)
 #define _CORBA_INTERFACEDEF__ARG_TRAITS_SS_
-  
+
   template<>
   class TAO_Domain_Export Arg_Traits<CORBA::InterfaceDef>
     : public
@@ -172,7 +172,7 @@ namespace
       : static_cast<typename TAO::SArg_Traits<T>::ret_val *> (
           skel_args[0])->arg ();
   }
-  
+
   template<typename T>
   typename TAO::SArg_Traits<T>::in_arg_type
   get_in_arg (TAO_Operation_Details const * details,
@@ -186,7 +186,7 @@ namespace
       : static_cast<typename TAO::SArg_Traits<T>::in_arg_val *> (
           skel_args[i])->arg ();
   }
-  
+
   template<typename T>
   typename TAO::SArg_Traits<T>::inout_arg_type
   get_inout_arg (TAO_Operation_Details const * details,
diff --git a/TAO/tao/ImR_Client/ImplRepoS.cpp b/TAO/tao/ImR_Client/ImplRepoS.cpp
index f2960b0d648..4cc915c960d 100644
--- a/TAO/tao/ImR_Client/ImplRepoS.cpp
+++ b/TAO/tao/ImR_Client/ImplRepoS.cpp
@@ -34,8 +34,8 @@
 
 
 #include "ImplRepoS.h"
+#include "tao/PortableServer/Operation_Table_Perfect_Hash.h"
 #include "tao/PortableServer/ForwardRequestC.h"
-#include "tao/PortableServer/Operation_Table.h"
 #include "tao/PortableServer/Upcall_Command.h"
 #include "tao/PortableServer/Upcall_Wrapper.h"
 #include "tao/PortableServer/Basic_SArguments.h"
diff --git a/TAO/tao/ImR_Client/ServerObjectS.cpp b/TAO/tao/ImR_Client/ServerObjectS.cpp
index 060461ae7d1..5b02307bc7b 100644
--- a/TAO/tao/ImR_Client/ServerObjectS.cpp
+++ b/TAO/tao/ImR_Client/ServerObjectS.cpp
@@ -34,8 +34,8 @@
 
 
 #include "ServerObjectS.h"
+#include "tao/PortableServer/Operation_Table_Perfect_Hash.h"
 #include "tao/PortableServer/ForwardRequestC.h"
-#include "tao/PortableServer/Operation_Table.h"
 #include "tao/PortableServer/Upcall_Command.h"
 #include "tao/PortableServer/Upcall_Wrapper.h"
 #include "tao/PortableServer/Basic_SArguments.h"
diff --git a/TAO/tao/Messaging/MessagingS.cpp b/TAO/tao/Messaging/MessagingS.cpp
index 1e4a7d6ab94..3cfac9fa26c 100644
--- a/TAO/tao/Messaging/MessagingS.cpp
+++ b/TAO/tao/Messaging/MessagingS.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_codegen.cpp:609
 
 #ifndef _TAO_IDL_ORIG_MESSAGINGS_CPP_
@@ -35,7 +35,7 @@
 
 #include "MessagingS.h"
 #include "tao/PortableServer/ForwardRequestC.h"
-#include "tao/PortableServer/Operation_Table.h"
+#include "tao/PortableServer/Operation_Table_Perfect_Hash.h"
 #include "tao/PortableServer/Upcall_Command.h"
 #include "tao/PortableServer/Upcall_Wrapper.h"
 #include "tao/PortableServer/Object_SArgument_T.h"
@@ -102,7 +102,7 @@ namespace
       : static_cast<typename TAO::SArg_Traits<T>::ret_val *> (
           skel_args[0])->arg ();
   }
-  
+
   template<typename T>
   typename TAO::SArg_Traits<T>::in_arg_type
   get_in_arg (TAO_Operation_Details const * details,
@@ -116,7 +116,7 @@ namespace
       : static_cast<typename TAO::SArg_Traits<T>::in_arg_val *> (
           skel_args[i])->arg ();
   }
-  
+
   template<typename T>
   typename TAO::SArg_Traits<T>::inout_arg_type
   get_inout_arg (TAO_Operation_Details const * details,
@@ -130,7 +130,7 @@ namespace
       : static_cast<typename TAO::SArg_Traits<T>::inout_arg_val *> (
           skel_args[i])->arg ();
   }
-  
+
   template<typename T>
   typename TAO::SArg_Traits<T>::out_arg_type
   get_out_arg (TAO_Operation_Details const * details,
diff --git a/TAO/tao/PortableServer/PolicyS.cpp b/TAO/tao/PortableServer/PolicyS.cpp
index aa3789961d6..9ef54889a37 100644
--- a/TAO/tao/PortableServer/PolicyS.cpp
+++ b/TAO/tao/PortableServer/PolicyS.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_codegen.cpp:609
 
 #ifndef _TAO_IDL_ORIG_POLICYS_CPP_
@@ -35,7 +35,7 @@
 
 #include "PolicyS.h"
 #include "tao/PortableServer/ForwardRequestC.h"
-#include "tao/PortableServer/Operation_Table.h"
+#include "tao/PortableServer/Operation_Table_Perfect_Hash.h"
 #include "tao/PortableServer/Upcall_Command.h"
 #include "tao/PortableServer/Upcall_Wrapper.h"
 #include "tao/PortableServer/Basic_SArguments.h"
@@ -79,7 +79,7 @@ namespace TAO
 
 #if !defined (_CORBA_POLICY__SARG_TRAITS_SS_)
 #define _CORBA_POLICY__SARG_TRAITS_SS_
-  
+
   template<>
   class TAO_PortableServer_Export SArg_Traits<CORBA::Policy>
     : public
@@ -104,7 +104,7 @@ namespace TAO
 
 #if !defined (_CORBA_POLICY__ARG_TRAITS_SS_)
 #define _CORBA_POLICY__ARG_TRAITS_SS_
-  
+
   template<>
   class TAO_PortableServer_Export Arg_Traits<CORBA::Policy>
     : public
@@ -138,7 +138,7 @@ namespace
       : static_cast<typename TAO::SArg_Traits<T>::ret_val *> (
           skel_args[0])->arg ();
   }
-  
+
   template<typename T>
   typename TAO::SArg_Traits<T>::in_arg_type
   get_in_arg (TAO_Operation_Details const * details,
@@ -152,7 +152,7 @@ namespace
       : static_cast<typename TAO::SArg_Traits<T>::in_arg_val *> (
           skel_args[i])->arg ();
   }
-  
+
   template<typename T>
   typename TAO::SArg_Traits<T>::inout_arg_type
   get_inout_arg (TAO_Operation_Details const * details,
@@ -166,7 +166,7 @@ namespace
       : static_cast<typename TAO::SArg_Traits<T>::inout_arg_val *> (
           skel_args[i])->arg ();
   }
-  
+
   template<typename T>
   typename TAO::SArg_Traits<T>::out_arg_type
   get_out_arg (TAO_Operation_Details const * details,
@@ -310,7 +310,7 @@ POA_CORBA::_TAO_Policy_Strategized_Proxy_Broker::the_TAO_Policy_Strategized_Prox
 {
   static POA_CORBA::_TAO_Policy_Strategized_Proxy_Broker
   strategized_proxy_broker;
-  
+
   return &strategized_proxy_broker;
 }
 
@@ -332,7 +332,7 @@ POA_CORBA::_TAO_Policy_Strategized_Proxy_Broker::get_strategy (
   TAO::Collocation_Strategy strategy =
     TAO_ORB_Core::collocation_strategy (obj ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (TAO::TAO_CS_REMOTE_STRATEGY);
-  
+
   return strategy;
 }
 
@@ -350,18 +350,18 @@ POA_CORBA::_TAO_Policy_Strategized_Proxy_Broker::dispatch (
   ACE_THROW_SPEC ((CORBA::Exception))
 {
   TAO_Abstract_ServantBase * const servant = obj->_servant ();
-  
+
   TAO_Collocated_Skeleton collocated_skel;
   int const status = servant->_find (op,
                                      collocated_skel,
                                      strategy,
                                      op_len);
-  
+
   if (status == -1)
     {
       ACE_THROW (CORBA::BAD_OPERATION (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO));
     }
-  
+
   ACE_TRY
     {
       collocated_skel (servant,
@@ -405,9 +405,9 @@ CORBA__TAO_Policy_Proxy_Broker_Factory_function (CORBA::Object_ptr)
 int
 CORBA__TAO_Policy_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA__TAO_Policy_Proxy_Broker_Factory_function_pointer = 
+  CORBA__TAO_Policy_Proxy_Broker_Factory_function_pointer =
     CORBA__TAO_Policy_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -429,14 +429,14 @@ CORBA__TAO_Policy_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::_TAO_Policy_Direct_Proxy_Impl (void)
 {}
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
 void
 POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::_get_policy_type (
     TAO_Abstract_ServantBase  *servant,
     TAO::Argument ** args,
-    int 
+    int
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -452,14 +452,14 @@ POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::_get_policy_type (
         );
   ACE_CHECK;
 }
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
 void
 POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::copy (
     TAO_Abstract_ServantBase  *servant,
     TAO::Argument ** args,
-    int 
+    int
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -475,14 +475,14 @@ POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::copy (
         );
   ACE_CHECK;
 }
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
 void
 POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::destroy (
     TAO_Abstract_ServantBase  *servant,
     TAO::Argument **,
-    int 
+    int
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -503,7 +503,7 @@ POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::destroy (
 //           End Direct Proxy Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::Policy::Policy (void)
@@ -522,7 +522,7 @@ POA_CORBA::Policy::~Policy (void)
 {
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:165
 
 void POA_CORBA::Policy::_get_policy_type_skel (
@@ -532,16 +532,16 @@ void POA_CORBA::Policy::_get_policy_type_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:74
-  
+
   class Upcall_Command
     : public TAO::Upcall_Command
   {
   public:
-    
+
     inline Upcall_Command (
       POA_CORBA::Policy * servant,
       TAO_Operation_Details const * operation_details,
@@ -551,70 +551,70 @@ void POA_CORBA::Policy::_get_policy_type_skel (
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::PolicyType>::ret_arg_type retval =
         get_ret_arg< ::CORBA::PolicyType> (
           this->operation_details_,
           this->args_);
-      
-      
+
+
       retval =
         this->servant_->policy_type (
           ACE_ENV_SINGLE_ARG_PARAMETER);
-        
+
     }
-  
+
   private:
-    
+
     POA_CORBA::Policy * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::PolicyType>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::Policy * const impl =
     static_cast<
       POA_CORBA::Policy *> (servant);
-  
+
   Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
                          , nargs
                          , command
-  
+
 #if TAO_HAS_INTERCEPTORS == 1
                          , servant_upcall
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-  
+
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:165
 
 void POA_CORBA::Policy::copy_skel (
@@ -624,16 +624,16 @@ void POA_CORBA::Policy::copy_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:74
-  
+
   class Upcall_Command
     : public TAO::Upcall_Command
   {
   public:
-    
+
     inline Upcall_Command (
       POA_CORBA::Policy * servant,
       TAO_Operation_Details const * operation_details,
@@ -643,70 +643,70 @@ void POA_CORBA::Policy::copy_skel (
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< CORBA::Policy>::ret_arg_type retval =
         get_ret_arg< CORBA::Policy> (
           this->operation_details_,
           this->args_);
-      
-      
+
+
       retval =
         this->servant_->copy (
           ACE_ENV_SINGLE_ARG_PARAMETER);
-        
+
     }
-  
+
   private:
-    
+
     POA_CORBA::Policy * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< CORBA::Policy>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::Policy * const impl =
     static_cast<
       POA_CORBA::Policy *> (servant);
-  
+
   Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
                          , nargs
                          , command
-  
+
 #if TAO_HAS_INTERCEPTORS == 1
                          , servant_upcall
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-  
+
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:165
 
 void POA_CORBA::Policy::destroy_skel (
@@ -716,93 +716,93 @@ void POA_CORBA::Policy::destroy_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:74
-  
+
   class Upcall_Command
     : public TAO::Upcall_Command
   {
   public:
-    
+
     inline Upcall_Command (
       POA_CORBA::Policy * servant)
       : servant_ (servant)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       this->servant_->destroy (
         ACE_ENV_SINGLE_ARG_PARAMETER);
-      
+
     }
-  
+
   private:
-    
+
     POA_CORBA::Policy * const servant_;
   };
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::Policy * const impl =
     static_cast<
       POA_CORBA::Policy *> (servant);
-  
+
   Upcall_Command command (
     impl);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
                          , nargs
                          , command
-  
+
 #if TAO_HAS_INTERCEPTORS == 1
                          , servant_upcall
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-  
+
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 void POA_CORBA::Policy::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:74
-  
+
   class Upcall_Command
     : public TAO::Upcall_Command
   {
   public:
-    
+
     inline Upcall_Command (
       POA_CORBA::Policy * servant,
       TAO_Operation_Details const * operation_details,
@@ -812,95 +812,95 @@ void POA_CORBA::Policy::_is_a_skel (
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         get_ret_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< CORBA::Char *>::in_arg_type arg_1 =
         get_in_arg< CORBA::Char *> (
           this->operation_details_,
           this->args_,
           1);
-        
-      
+
+
       retval =
         this->servant_-> _is_a (
           arg_1
           ACE_ENV_ARG_PARAMETER);
-        
+
     }
-  
+
   private:
-    
+
     POA_CORBA::Policy * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::Policy * const impl =
     static_cast<
       POA_CORBA::Policy *> (servant);
-  
+
   Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
                          , nargs
                          , command
-  
+
 #if TAO_HAS_INTERCEPTORS == 1
                          , servant_upcall
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-  
+
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 void POA_CORBA::Policy::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:74
-  
+
   class Upcall_Command
     : public TAO::Upcall_Command
   {
   public:
-    
+
     inline Upcall_Command (
       POA_CORBA::Policy * servant,
       TAO_Operation_Details const * operation_details,
@@ -910,78 +910,78 @@ void POA_CORBA::Policy::_non_existent_skel (
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         get_ret_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_);
-      
-      
+
+
       retval =
         this->servant_-> _non_existent (
           ACE_ENV_SINGLE_ARG_PARAMETER);
-        
+
     }
-  
+
   private:
-    
+
     POA_CORBA::Policy * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::Policy * const impl =
     static_cast<
       POA_CORBA::Policy *> (servant);
-  
+
   Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
                          , nargs
                          , command
-  
+
 #if TAO_HAS_INTERCEPTORS == 1
                          , servant_upcall
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-  
+
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:385
 
 
 
 void POA_CORBA::Policy::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
     ACE_ENV_ARG_DECL
@@ -991,31 +991,31 @@ void POA_CORBA::Policy::_interface_skel (
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
       ACE_THROW (CORBA::INTF_REPOS (CORBA::OMGVMCID | 1,
                                     CORBA::COMPLETED_NO));
     }
-  
+
   POA_CORBA::Policy * const impl =
     static_cast<
       POA_CORBA::Policy *> (servant);
-  CORBA::InterfaceDef_ptr _tao_retval = 
+  CORBA::InterfaceDef_ptr _tao_retval =
     impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == 0)
     {
       ACE_THROW (CORBA::MARSHAL ());
@@ -1023,22 +1023,22 @@ void POA_CORBA::Policy::_interface_skel (
 }
 
 void POA_CORBA::Policy::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:74
-  
+
   class Upcall_Command
     : public TAO::Upcall_Command
   {
   public:
-    
+
     inline Upcall_Command (
       POA_CORBA::Policy * servant,
       TAO_Operation_Details const * operation_details,
@@ -1048,67 +1048,67 @@ void POA_CORBA::Policy::_component_skel (
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         get_ret_arg< ::CORBA::Object> (
           this->operation_details_,
           this->args_);
-      
-      
+
+
       retval =
         this->servant_-> _get_component (
           ACE_ENV_SINGLE_ARG_PARAMETER);
-        
+
     }
-  
+
   private:
-    
+
     POA_CORBA::Policy * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::Policy * const impl =
     static_cast<
       POA_CORBA::Policy *> (servant);
-  
+
   Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
                          , nargs
                          , command
-  
+
 #if TAO_HAS_INTERCEPTORS == 1
                          , servant_upcall
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-  
+
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 CORBA::Boolean POA_CORBA::Policy::_is_a (
@@ -1157,22 +1157,22 @@ POA_CORBA::Policy::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   CORBA::Boolean _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::Policy STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -1222,7 +1222,7 @@ POA_CORBA::Policy::_this (ACE_ENV_SINGLE_ARG_DECL)
 
 #endif /* end #if !defined */
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 #endif /* ifndef */