ChangeLogTag: Fri Sep 24 15:12:48 UTC 2010 Jeff Parsons <j.parsons@vanderbilt.edu>

14 files changed, 59 insertions, 37 deletions

diff --git a/ChangeLog b/ChangeLog
index 61f0f3214dd..0b5680b7ee1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+Fri Sep 24 15:12:48 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp:
+        * orbsvcs/orbsvcs/Sched/Config_Scheduler.h:
+        * orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp:
+        * orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h:
+        * TAO_IDL/be/be_visitor_argument/arglist.cpp:
+        * tao/PortableServer/POAManagerFactory.cpp:
+        * tao/PortableServer/POAManagerFactory.h:
+        * tao/PortableServer/Object_Adapter.cpp:
+        * tao/PortableServer/Root_POA.cpp:
+        * tao/PortableServer/Root_POA.h:
+        * tao/Object_KeyC.h:
+        * tao/PI/ORBInitInfo.cpp:
+        * tao/PI/ORBInitInfo.h:
+
+          Changed generation type of std::string IN parameter
+          from const std::string to const std::string &,
+          regenerated, and modified operation implementations
+          accordingly.
+
 Thu Sep 16 18:59:25 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * orbsvcs/orbsvcs/Sched/DynSched.cpp:
diff --git a/TAO_IDL/be/be_visitor_argument/arglist.cpp b/TAO_IDL/be/be_visitor_argument/arglist.cpp
index adc708b7874..4579bf2cf1c 100644
--- a/TAO_IDL/be/be_visitor_argument/arglist.cpp
+++ b/TAO_IDL/be/be_visitor_argument/arglist.cpp
@@ -321,7 +321,7 @@ int be_visitor_args_arglist::visit_string (be_string *node)
       switch (this->direction ())
         {
           case AST_Argument::dir_IN:
-            *os << "const std::string";
+            *os << "const std::string &";
             break;
           default:
             *os << "std::string &";
diff --git a/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp b/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
index 7e25bf24d96..76155111d65 100644
--- a/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
+++ b/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
@@ -30,7 +30,7 @@ ACE_Config_Scheduler::~ACE_Config_Scheduler (void)
 }
 
 RtecScheduler::handle_t
-ACE_Config_Scheduler::create (const std::string entry_point)
+ACE_Config_Scheduler::create (const std::string & entry_point)
 {
   typedef RtecScheduler::RT_Info* RT_Info_ptr;
 
@@ -79,7 +79,7 @@ ACE_Config_Scheduler::create (const std::string entry_point)
 }
 
 RtecScheduler::handle_t
-ACE_Config_Scheduler::lookup (const std::string entry_point)
+ACE_Config_Scheduler::lookup (const std::string & entry_point)
 {
   RtecScheduler::RT_Info* rt_info = 0;
   switch (impl->get_rt_info (entry_point.c_str (), rt_info))
@@ -172,7 +172,7 @@ void ACE_Config_Scheduler::priority (RtecScheduler::handle_t handle,
     }
 }
 
-void ACE_Config_Scheduler::entry_point_priority (const std::string entry_point,
+void ACE_Config_Scheduler::entry_point_priority (const std::string & entry_point,
                                                  RtecScheduler::OS_Priority& priority,
                                                  RtecScheduler::Preemption_Subpriority_t& p_subpriority,
                                                  RtecScheduler::Preemption_Priority_t& p_priority)
diff --git a/orbsvcs/orbsvcs/Sched/Config_Scheduler.h b/orbsvcs/orbsvcs/Sched/Config_Scheduler.h
index 66a55ef519e..bf3921e1948 100644
--- a/orbsvcs/orbsvcs/Sched/Config_Scheduler.h
+++ b/orbsvcs/orbsvcs/Sched/Config_Scheduler.h
@@ -41,9 +41,9 @@ public:
   ACE_Config_Scheduler (void);
   virtual ~ACE_Config_Scheduler (void);
 
-  virtual RtecScheduler::handle_t create (const std::string entry_point);
+  virtual RtecScheduler::handle_t create (const std::string & entry_point);
 
-  virtual RtecScheduler::handle_t lookup (const std::string entry_point);
+  virtual RtecScheduler::handle_t lookup (const std::string & entry_point);
 
   virtual RtecScheduler::RT_Info* get (RtecScheduler::handle_t handle);
 
@@ -63,7 +63,7 @@ public:
                          RtecScheduler::Preemption_Subpriority_t& p_subpriority,
                          RtecScheduler::Preemption_Priority_t& p_priority);
 
-  virtual void entry_point_priority (const std::string entry_point,
+  virtual void entry_point_priority (const std::string & entry_point,
                                      RtecScheduler::OS_Priority& priority,
                                      RtecScheduler::Preemption_Subpriority_t& p_subpriority,
                                      RtecScheduler::Preemption_Priority_t& p_priority);
diff --git a/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp b/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp
index bfbe69ae5c6..9a3671673e2 100644
--- a/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp
+++ b/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp
@@ -423,7 +423,7 @@ TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::close (void)
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
 RtecScheduler::handle_t
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-create (const std::string entry_point)
+create (const std::string & entry_point)
 {
 #if defined (SCHEDULER_LOGGING)
   ACE_DEBUG ((LM_TRACE,
@@ -450,7 +450,7 @@ create (const std::string entry_point)
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
 RtecScheduler::handle_t
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-lookup (const std::string entry_point)
+lookup (const std::string & entry_point)
 {
 #if defined (SCHEDULER_LOGGING)
   ACE_DEBUG ((LM_TRACE,
@@ -899,7 +899,7 @@ priority (RtecScheduler::handle_t handle,
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
 void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-entry_point_priority (const std::string entry_point,
+entry_point_priority (const std::string & entry_point,
                       RtecScheduler::OS_Priority& priority,
                       RtecScheduler::Preemption_Subpriority_t& subpriority,
                       RtecScheduler::Preemption_Priority_t& p_priority)
diff --git a/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h b/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h
index 0df5caf52e4..d3fa549dd72 100644
--- a/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h
+++ b/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h
@@ -116,11 +116,11 @@ public:
    * RT_Info is returned.  If the RT_Info already exists, an exception
    * is thrown.
    */
-  virtual RtecScheduler::handle_t create (const std::string entry_point);
+  virtual RtecScheduler::handle_t create (const std::string & entry_point);
 
   /// Lookup a handle for an RT_Info, and return its handle, or an error
   /// value if it's not present.
-  virtual RtecScheduler::handle_t lookup (const std::string entry_point);
+  virtual RtecScheduler::handle_t lookup (const std::string & entry_point);
 
   /// Return a pointer to the RT_Info corresponding to the passed handle.
   virtual RtecScheduler::RT_Info* get (RtecScheduler::handle_t handle);
@@ -174,7 +174,7 @@ public:
 
   /// Returns the priority and subpriority values assigned to an RT_Info,
   /// based on its entry point name.
-  virtual void entry_point_priority (const std::string entry_point,
+  virtual void entry_point_priority (const std::string & entry_point,
                                      RtecScheduler::OS_Priority& o_priority,
                                      RtecScheduler::Preemption_Subpriority_t& p_subpriority,
                                      RtecScheduler::Preemption_Priority_t& p_priority);
diff --git a/tao/Object_KeyC.h b/tao/Object_KeyC.h
index 8ef85c75402..313b85f67ab 100644
--- a/tao/Object_KeyC.h
+++ b/tao/Object_KeyC.h
@@ -28,8 +28,8 @@
 // TAO_IDL - Generated from
 // .\be\be_codegen.cpp:149
 
-#ifndef _TAO_PIDL_OBJECT_KEYC_RNNW6J_H_
-#define _TAO_PIDL_OBJECT_KEYC_RNNW6J_H_
+#ifndef _TAO_PIDL_OBJECT_KEYC_GNYJHL_H_
+#define _TAO_PIDL_OBJECT_KEYC_GNYJHL_H_
 
 #include /**/ "ace/pre.h"
 
diff --git a/tao/PI/ORBInitInfo.cpp b/tao/PI/ORBInitInfo.cpp
index 34f82cdcb80..f9a19537d97 100644
--- a/tao/PI/ORBInitInfo.cpp
+++ b/tao/PI/ORBInitInfo.cpp
@@ -150,7 +150,7 @@ TAO_ORBInitInfo::codec_factory (void)
 
 void
 TAO_ORBInitInfo::register_initial_reference (
-    const std::string id,
+    const std::string & id,
     CORBA::Object_ptr obj)
 {
   this->check_validity ();
@@ -169,7 +169,7 @@ TAO_ORBInitInfo::register_initial_reference (
 }
 
 CORBA::Object_ptr
-TAO_ORBInitInfo::resolve_initial_references (const std::string id)
+TAO_ORBInitInfo::resolve_initial_references (const std::string & id)
 {
   this->check_validity ();
 
diff --git a/tao/PI/ORBInitInfo.h b/tao/PI/ORBInitInfo.h
index ae61060d083..8141d784076 100644
--- a/tao/PI/ORBInitInfo.h
+++ b/tao/PI/ORBInitInfo.h
@@ -92,12 +92,12 @@ public:
    * resolve_initial_references() that may be called in the
    * ORBInitializer::post_init() call.
    */
-  virtual void register_initial_reference (const std::string id, CORBA::Object_ptr obj);
+  virtual void register_initial_reference (const std::string & id, CORBA::Object_ptr obj);
 
   /// Obtain a reference to an object that may not yet be available
   /// via the usual CORBA::ORB::resolve_initial_references() mechanism
   /// since the ORB may not be fully initialized yet.
-  virtual CORBA::Object_ptr resolve_initial_references (const std::string id);
+  virtual CORBA::Object_ptr resolve_initial_references (const std::string & id);
 
   /// Register a client request interceptor with the ORB currently
   /// being initialized.
diff --git a/tao/PortableServer/Object_Adapter.cpp b/tao/PortableServer/Object_Adapter.cpp
index 6a5c8edcc2c..81c5cae34ea 100644
--- a/tao/PortableServer/Object_Adapter.cpp
+++ b/tao/PortableServer/Object_Adapter.cpp
@@ -585,9 +585,10 @@ TAO_Object_Adapter::open (void)
                     CORBA::NO_MEMORY ());
 
   ::CORBA::PolicyList policy;
+  std::string default_name (TAO_DEFAULT_ROOTPOAMANAGER_NAME);
   PortableServer::POAManager_var poa_manager
-    = poa_manager_factory_->create_POAManager (TAO_DEFAULT_ROOTPOAMANAGER_NAME,
-                                              policy);
+    = poa_manager_factory_->create_POAManager (default_name,
+                                               policy);
 #else
   PortableServer::POAManager_ptr poa_manager_ptr;
   ::CORBA::PolicyList policy_list;
diff --git a/tao/PortableServer/POAManagerFactory.cpp b/tao/PortableServer/POAManagerFactory.cpp
index c9d0e57702a..59a6100803e 100644
--- a/tao/PortableServer/POAManagerFactory.cpp
+++ b/tao/PortableServer/POAManagerFactory.cpp
@@ -26,7 +26,7 @@ TAO_POAManager_Factory::~TAO_POAManager_Factory (void)
 
 ::PortableServer::POAManager_ptr
 TAO_POAManager_Factory::create_POAManager (
-  const std::string id,
+  const std::string & id,
   const ::CORBA::PolicyList & policies
   )
 {
@@ -106,7 +106,7 @@ TAO_POAManager_Factory::list (void)
 }
 
 ::PortableServer::POAManager_ptr
-TAO_POAManager_Factory::find (const std::string id)
+TAO_POAManager_Factory::find (const std::string & id)
 {
   ::PortableServer::POAManager_ptr poamanager =
     ::PortableServer::POAManager::_nil();
diff --git a/tao/PortableServer/POAManagerFactory.h b/tao/PortableServer/POAManagerFactory.h
index fe251352315..4d44891c504 100644
--- a/tao/PortableServer/POAManagerFactory.h
+++ b/tao/PortableServer/POAManagerFactory.h
@@ -48,12 +48,12 @@ public:
   virtual ~TAO_POAManager_Factory (void);
 
   virtual ::PortableServer::POAManager_ptr create_POAManager (
-      const std::string id,
+      const std::string & id,
       const ::CORBA::PolicyList & policies);
 
   virtual ::PortableServer::POAManagerFactory::POAManagerSeq list (void);
 
-  virtual ::PortableServer::POAManager_ptr find (const std::string id);
+  virtual ::PortableServer::POAManager_ptr find (const std::string & id);
 
   void remove_all_poamanagers (void);
 
diff --git a/tao/PortableServer/Root_POA.cpp b/tao/PortableServer/Root_POA.cpp
index d41f763ee2e..ee41a71a580 100644
--- a/tao/PortableServer/Root_POA.cpp
+++ b/tao/PortableServer/Root_POA.cpp
@@ -601,7 +601,7 @@ TAO_Root_POA::create_POA_i (const TAO_Root_POA::String &adapter_name,
 
 #if ! defined (CORBA_E_MICRO)
 PortableServer::POA_ptr
-TAO_Root_POA::find_POA (const std::string adapter_name,
+TAO_Root_POA::find_POA (const std::string & adapter_name,
                         CORBA::Boolean activate_it)
 {
   // Lock access for the duration of this transaction.
@@ -615,7 +615,7 @@ TAO_Root_POA::find_POA (const std::string adapter_name,
 
 #if ! defined (CORBA_E_MICRO)
 TAO_Root_POA *
-TAO_Root_POA::find_POA_i (const std::string &child_name,
+TAO_Root_POA::find_POA_i (const std::string & child_name,
                           CORBA::Boolean activate_it)
 {
   TAO_Root_POA *child = 0;
@@ -693,7 +693,7 @@ TAO_Root_POA::tao_poa_manager ()
 
 #if ! defined (CORBA_E_MICRO)
 PortableServer::POA_ptr
-TAO_Root_POA::create_POA (const std::string adapter_name,
+TAO_Root_POA::create_POA (const std::string & adapter_name,
                           PortableServer::POAManager_ptr poa_manager,
                           const CORBA::PolicyList &policies)
 {
@@ -771,13 +771,13 @@ TAO_Root_POA::id_to_reference (const PortableServer::ObjectId &oid)
 #if ! defined (CORBA_E_MICRO)
 CORBA::Object_ptr
 TAO_Root_POA::create_reference_with_id (const PortableServer::ObjectId &id,
-                                        const std::string intf)
+                                        const std::string & intf)
 {
   // Lock access for the duration of this transaction.
   TAO_POA_GUARD_RETURN (CORBA::Object::_nil ());
 
   return this->create_reference_with_id_i (id,
-                                           intf.c_str (),
+                                           intf,
                                            this->server_priority ());
 }
 #endif
@@ -1291,7 +1291,7 @@ TAO_Root_POA::is_persistent (void) const
 }
 
 CORBA::Object_ptr
-TAO_Root_POA::create_reference (const std::string intf)
+TAO_Root_POA::create_reference (const std::string & intf)
 {
   // Lock access for the duration of this transaction.
   TAO_POA_GUARD_RETURN (CORBA::Object::_nil ());
@@ -1336,7 +1336,7 @@ TAO_Root_POA::invoke_key_to_object_helper_i (const char * repository_id,
 #if ! defined (CORBA_E_MICRO)
 CORBA::Object_ptr
 TAO_Root_POA::create_reference_with_id_i (const PortableServer::ObjectId &user_id,
-                                          std::string intf,
+                                          const std::string & intf,
                                           CORBA::Short priority)
 {
   // If the POA has the SYSTEM_ID policy and it detects that the
diff --git a/tao/PortableServer/Root_POA.h b/tao/PortableServer/Root_POA.h
index f9be43b8492..ba78c82f4b5 100644
--- a/tao/PortableServer/Root_POA.h
+++ b/tao/PortableServer/Root_POA.h
@@ -128,11 +128,11 @@ public:
 
 #if !defined (CORBA_E_MICRO)
   PortableServer::POA_ptr create_POA (
-      const std::string adapter_name,
+      const std::string & adapter_name,
       PortableServer::POAManager_ptr poa_manager,
       const CORBA::PolicyList &policies);
 
-  PortableServer::POA_ptr find_POA (const std::string adapter_name,
+  PortableServer::POA_ptr find_POA (const std::string & adapter_name,
                                     CORBA::Boolean activate_it);
 #endif
 
@@ -222,12 +222,12 @@ public:
 
   void deactivate_object (const PortableServer::ObjectId &oid);
 
-  CORBA::Object_ptr create_reference (const std:: string intf);
+  CORBA::Object_ptr create_reference (const std::string & intf);
 
 #if !defined (CORBA_E_MICRO)
   CORBA::Object_ptr create_reference_with_id (
       const PortableServer::ObjectId &oid,
-      const std::string intf);
+      const std::string & intf);
 #endif
 
   PortableServer::ObjectId servant_to_id (PortableServer::Servant p_servant);
@@ -566,7 +566,7 @@ protected:
 
   CORBA::Object_ptr create_reference_with_id_i (
       const PortableServer::ObjectId &oid,
-      std::string intf,
+      const std::string & intf,
       CORBA::Short priority);
 
   PortableServer::Servant reference_to_servant_i (CORBA::Object_ptr reference);