summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/orbsvcs')
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp2
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.h10
-rw-r--r--TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp5
-rw-r--r--TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp2
-rw-r--r--TAO/orbsvcs/LifeCycle_Service/Factory_Trader.h2
-rw-r--r--TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp5
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.h2
-rw-r--r--TAO/orbsvcs/tests/Property/client.cpp8
9 files changed, 17 insertions, 21 deletions
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp
index 69730f2441e..1ba3eb714cb 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp
@@ -479,7 +479,7 @@ ImplRepo_i::run (CORBA::Environment& env)
return 0;
}
-CORBA::String
+char*
ImplRepo_i::get_forward_host (const char *server)
{
ACE_TString host, server_object_ior;
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.h b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.h
index 009ec7aeb52..1c40118765d 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.h
+++ b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.h
@@ -87,7 +87,7 @@ public:
CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
ACE_THROW_SPEC ((CORBA::SystemException,
ImplementationRepository::Administration::AlreadyRegistered));
- // Adds the server to the repository and registers the startup information about
+ // Adds the server to the repository and registers the startup information about
// the server <server>.
virtual void reregister_server (const char *server,
@@ -108,8 +108,8 @@ public:
ImplementationRepository::Administration::NotFound));
// Attempts to gracefully shut down the server, if that fails, will try
// to do it ungracefully.
-
- virtual ImplementationRepository::Address *
+
+ virtual ImplementationRepository::Address *
server_is_running (const char * server,
const ImplementationRepository::Address &addr,
ImplementationRepository::ServerObject_ptr server_object,
@@ -142,14 +142,14 @@ public:
// = Other methods
- int init (int argc, char **argv,
+ int init (int argc, char **argv,
CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
// Initialize the Server state - parsing arguments and waiting.
int run (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
// Runs the orb.
- CORBA::String get_forward_host (const char *server);
+ char* get_forward_host (const char *server);
// Returns the host of the server that needs to be forwarded to.
CORBA::UShort get_forward_port (const char *server);
diff --git a/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp b/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp
index 19738fe304a..706fe4893f2 100644
--- a/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp
+++ b/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp
@@ -39,7 +39,7 @@ Criteria_Evaluator::getInitialization (CORBA::Environment &ACE_TRY_ENV)
("No initialization member found.\n"),
0);
- *any_ptr >>= sequence_ptr;
+ *any_ptr >>= sequence_ptr;
return sequence_ptr;
}
@@ -47,7 +47,7 @@ Criteria_Evaluator::getInitialization (CORBA::Environment &ACE_TRY_ENV)
char *
Criteria_Evaluator::getFilter (CORBA::Environment &ACE_TRY_ENV)
{
- CORBA::String string;
+ char* string;
CORBA::Any value;
CORBA::Any_ptr any_ptr = this->getCriteriaMember ("filter");
@@ -85,4 +85,3 @@ Criteria_Evaluator::getCriteriaMember (const char *member_name)
return 0;
}
-
diff --git a/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp b/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp
index 0ce333c6610..f2a37dea733 100644
--- a/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp
+++ b/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp
@@ -162,7 +162,7 @@ Factory_Trader::_cxx_export (const char * name,
CORBA::Object_ptr
-Factory_Trader::query (const CORBA::String constraint)
+Factory_Trader::query (const char* constraint)
{
ACE_TRY_NEW_ENV
{
diff --git a/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.h b/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.h
index ff4284af91b..bba04656a87 100644
--- a/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.h
+++ b/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.h
@@ -38,7 +38,7 @@ public:
const CORBA::Object_ptr object_ptr);
// export a specific factory
- CORBA::Object_ptr query (const CORBA::String constraint);
+ CORBA::Object_ptr query (const char* constraint);
// query for a specific factory using a constraint
static const char * GENERIC_FACTORY_INTERFACE_REPOSITORY_ID;
diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp
index 0f1eca080a0..4c8cbf69e89 100644
--- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp
+++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp
@@ -64,7 +64,7 @@ Life_Cycle_Service_i::create_object (const CosLifeCycle::Key &factory_key,
if (this->debug_level_ >= 2)
ACE_DEBUG ((LM_DEBUG, "Life_Cycle_Service_i:create_object: getFilter will be called.\n"));
- CORBA::String filter = criteria_Evaluator.getFilter (ACE_TRY_ENV);
+ char* filter = criteria_Evaluator.getFilter (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
if (this->debug_level_ >= 2)
@@ -167,6 +167,3 @@ Life_Cycle_Service_i::register_factory (const char * name,
" Description: %s\n",
name, location, description));
}
-
-
-
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp
index a2a5e52d5bd..bdef4870268 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp
@@ -247,7 +247,7 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb,
return 0;
}
-CORBA::String
+char*
TAO_Naming_Server::naming_service_ior (void)
{
return CORBA::string_dup (this->naming_service_ior_.in ());
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.h
index d0da3e2847f..1ddc1389ced 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.h
@@ -96,7 +96,7 @@ public:
~TAO_Naming_Server (void);
// Destructor.
- CORBA::String naming_service_ior (void);
+ char * naming_service_ior (void);
// Returns the IOR of the naming service.
CosNaming::NamingContext_ptr operator-> (void) const;
diff --git a/TAO/orbsvcs/tests/Property/client.cpp b/TAO/orbsvcs/tests/Property/client.cpp
index c00628af1c8..90ea0941cf0 100644
--- a/TAO/orbsvcs/tests/Property/client.cpp
+++ b/TAO/orbsvcs/tests/Property/client.cpp
@@ -183,7 +183,7 @@ Client::test_define_property (CORBA::Environment &ACE_TRY_ENV)
// Prepare a String and "define" that in the PropertySet.
CORBA::String_var strvar (CORBA::string_dup ("Test_String"));
anyval <<= strvar.in ();
- CORBA::String newstr;
+ char * newstr;
anyval >>= newstr;
propsetdef_->define_property ("string_property",
anyval,
@@ -508,7 +508,7 @@ Client::test_get_all_properties (CORBA::Environment &ACE_TRY_ENV)
if (properties [pi].property_value.type () == CORBA::_tc_string)
{
- CORBA::String str;
+ char* str;
properties [pi].property_value >>= str;
ACE_DEBUG ((LM_DEBUG,"%s\n", str));
}
@@ -567,7 +567,7 @@ Client::test_get_all_properties (CORBA::Environment &ACE_TRY_ENV)
if (property->property_value.type () == CORBA::_tc_string)
{
- CORBA::String str;
+ char* str;
property->property_value >>= str;
ACE_DEBUG ((LM_DEBUG,"%s\n", str));
}
@@ -650,7 +650,7 @@ Client::test_define_property_with_mode (CORBA::Environment &ACE_TRY_ENV)
// Prepare a String and "define" that in the PropertySet.
CORBA::String_var strvar (CORBA::string_dup ("Test_String"));
anyval <<= strvar.in ();
- CORBA::String newstr;
+ char* newstr;
anyval >>= newstr;
propsetdef_->define_property ("string_property",
View Lorry Controller Status