ChangeLogTag: Thu Oct 24 000:33:17 2002 Jeff Parsons <parsons@isis-server.isis.vanderbilt.edu>

7 files changed, 33 insertions, 13 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 6cca0eaa087..b7ecfb8f234 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,17 @@
+Thu Oct 24 000:33:17 2002  Jeff Parsons <parsons@isis-server.isis.vanderbilt.edu>
+
+        * examples/POA/DSI/Database_i.cpp:
+        * examples/POA/DSI/Database_i.h:
+        * examples/RTCORBA/Activity/Activity.cpp:
+	* orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp:
+	* orbsvcs/Notify_Service/Notify_Service.cpp:
+	* orbsvcs/orbsvcs/SSLIOP/SSLIOP_Vault.cpp:
+	* orbsvcs/orbsvcs/SSLIOP/SSLIOP_Vault.h:
+	* orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp:
+
+	  Replaced char * arguments with corresponding typedefs in cases where 
+	  the IDL compiler now generates the typedef name.
+
 Wed Oct 23 23:51:51 2002  Jeff Parsons <parsons@isis-server.isis.vanderbilt.edu>
 
         * tests/Makefile:
diff --git a/TAO/examples/POA/DSI/Database_i.cpp b/TAO/examples/POA/DSI/Database_i.cpp
index fb953ff8b78..1cfb2213e9f 100644
--- a/TAO/examples/POA/DSI/Database_i.cpp
+++ b/TAO/examples/POA/DSI/Database_i.cpp
@@ -149,7 +149,7 @@ DatabaseImpl::Agent::~Agent (void)
 
 Database::Entry_ptr
 DatabaseImpl::Agent::create_entry (const char *key,
-                                   const char *entry_type,
+                                   const Database::Identifier entry_type,
                                    const Database::NVPairSequence &initial_attributes
                                    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
@@ -219,7 +219,7 @@ DatabaseImpl::Agent::create_entry (const char *key,
 
 Database::Entry_ptr
 DatabaseImpl::Agent::find_entry (const char *key,
-                                 const char *entry_type
+                                 const Database::Identifier entry_type
                                  ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Database::Unknown_Type,
@@ -275,7 +275,7 @@ DatabaseImpl::Agent::find_entry (const char *key,
 
 void
 DatabaseImpl::Agent::destroy_entry (const char *key,
-                                    const char *entry_type
+                                    const Database::Identifier entry_type
                                     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Database::Unknown_Type,
diff --git a/TAO/examples/POA/DSI/Database_i.h b/TAO/examples/POA/DSI/Database_i.h
index 25c120a7b0e..4ed48fddd2a 100644
--- a/TAO/examples/POA/DSI/Database_i.h
+++ b/TAO/examples/POA/DSI/Database_i.h
@@ -76,7 +76,7 @@ public:
     ~Agent (void);
 
     virtual Database::Entry_ptr create_entry (const char *key,
-                                              const char *entry_type,
+                                              const Database::Identifier entry_type,
                                               const Database::NVPairSequence &initial_attributes
                                               ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
@@ -84,14 +84,14 @@ public:
                        Database::Duplicate_Key));
 
     virtual Database::Entry_ptr find_entry (const char *key,
-                                            const char *entry_type
+                                            const Database::Identifier entry_type
                                             ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Database::Unknown_Type,
                        Database::Not_Found));
 
     virtual void destroy_entry (const char *key,
-                                const char *entry_type
+                                const Database::Identifier entry_type
                                 ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Database::Unknown_Type,
diff --git a/TAO/examples/RTCORBA/Activity/Activity.cpp b/TAO/examples/RTCORBA/Activity/Activity.cpp
index 1d9a3966392..73a4eeb00fd 100644
--- a/TAO/examples/RTCORBA/Activity/Activity.cpp
+++ b/TAO/examples/RTCORBA/Activity/Activity.cpp
@@ -198,7 +198,8 @@ Activity::activate_job_list (ACE_ENV_SINGLE_ARG_DECL)
       const ACE_CString &job_name = job->name ();
 
       CosNaming::Name_var name =
-        this->naming_->to_name (job_name.c_str ()
+        this->naming_->to_name (ACE_const_cast (const CosNaming::NamingContextExt::StringName,
+                                                job_name.c_str ())
                                 ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
diff --git a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp
index f5c11d7cda3..7a29cc7f065 100644
--- a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp
+++ b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp
@@ -93,7 +93,8 @@ Notify_Logging_Service::init (int argc, char *argv[]
   ACE_ASSERT (!CORBA::is_nil (this->naming_.in ()));
 
   CosNaming::Name_var name =
-    this->naming_->to_name (this->notify_factory_name_.c_str ()
+    this->naming_->to_name (ACE_const_cast (const CosNaming::NamingContextExt::StringName,
+                                            this->notify_factory_name_.c_str ())
                             ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
@@ -165,7 +166,8 @@ Notify_Logging_Service::shutdown (ACE_ENV_SINGLE_ARG_DECL)
   ACE_CHECK;
 
   CosNaming::Name_var name =
-    this->naming_->to_name (this->notify_factory_name_.c_str ()
+    this->naming_->to_name (ACE_const_cast (const CosNaming::NamingContextExt::StringName,
+                                            this->notify_factory_name_.c_str ())
                             ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
diff --git a/TAO/orbsvcs/Notify_Service/Notify_Service.cpp b/TAO/orbsvcs/Notify_Service/Notify_Service.cpp
index ffa2953f1fa..f45e68ee408 100644
--- a/TAO/orbsvcs/Notify_Service/Notify_Service.cpp
+++ b/TAO/orbsvcs/Notify_Service/Notify_Service.cpp
@@ -173,7 +173,8 @@ TAO_Notify_Service::init (int argc, ACE_TCHAR *argv[]
       CORBA::string_dup (this->notify_factory_name_.c_str ());
 #else
     CosNaming::Name_var name =
-      this->naming_->to_name (this->notify_factory_name_.c_str ()
+      this->naming_->to_name (ACE_const_cast (const CosNaming::NamingContextExt::StringName,
+                                              this->notify_factory_name_.c_str ())
                               ACE_ENV_ARG_PARAMETER);
 #endif /* TAO_NOTIFY_USE_NAMING_CONTEXT */
 
@@ -214,7 +215,8 @@ TAO_Notify_Service::init (int argc, ACE_TCHAR *argv[]
           CORBA::string_dup (this->notify_channel_name_.c_str ());
 #else
         name = this->naming_->to_name (
-          this->notify_channel_name_.c_str ()
+          ACE_const_cast (const CosNaming::NamingContextExt::StringName,
+                          this->notify_channel_name_.c_str ())
           ACE_ENV_ARG_PARAMETER);
 #endif /* TAO_NOTIFY_USE_NAMING_CONTEXT */
         ACE_CHECK_RETURN (-1);
@@ -320,7 +322,8 @@ TAO_Notify_Service::shutdown (ACE_ENV_SINGLE_ARG_DECL)
       CORBA::string_dup (this->notify_factory_name_.c_str ());
 #else
     CosNaming::Name_var name =
-      this->naming_->to_name (this->notify_factory_name_.c_str ()
+      this->naming_->to_name (ACE_const_cast (const CosNaming::NamingContextExt::StringName,
+                                              this->notify_factory_name_.c_str ())
                               ACE_ENV_ARG_PARAMETER);
 #endif /* TAO_NOTIFY_USE_NAMING_CONTEXT */
 
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp
index ae8a7fc7dd9..ddfbe25a42a 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp
@@ -139,7 +139,7 @@ LB_server::create_object_group (void)
 {
   ACE_TRY_NEW_ENV
     {
-      const char *repository_id = "IDL:Test/Basic:1.0";
+      const PortableGroup::GroupDomainId repository_id = "IDL:Test/Basic:1.0";
 
       PortableGroup::Criteria criteria (1);
       criteria.length (1);