summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--TAO/CIAO/DAnCE/Config_Handlers/BaseTypes_Handler.cpp9
-rw-r--r--TAO/CIAO/DAnCE/Config_Handlers/BaseTypes_Handler.h4
2 files changed, 8 insertions, 5 deletions
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/BaseTypes_Handler.cpp b/TAO/CIAO/DAnCE/Config_Handlers/BaseTypes_Handler.cpp
index 326ac345649..fc52957a943 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/BaseTypes_Handler.cpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/BaseTypes_Handler.cpp
@@ -10,11 +10,14 @@ CIAO::Config_Handlers::BaseTypes_Handler::~BaseTypes_Handler()
///This method takes a <CORBA::string> and an
///<XMLSchema::string> and stores the value from
///the <XMLSchema::string> in the <CORBA::string>.
-void
-CIAO::Config_Handlers::get_string (Corba::string& str,
- XMLSchema::string& desc)
+CORBA::String_var&
+CIAO::Config_Handlers::get_string (CORBA::String_var& str,
+ XMLSchema::string<char>& desc)
{
//Convert duplicate the XMLSchema::string and
//assign it to the Corba::string.
str = CORBA::string_dup(desc.c_str());
+
+ return str;
}
+
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/BaseTypes_Handler.h b/TAO/CIAO/DAnCE/Config_Handlers/BaseTypes_Handler.h
index d9ce9729de4..884adbfb893 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/BaseTypes_Handler.h
+++ b/TAO/CIAO/DAnCE/Config_Handlers/BaseTypes_Handler.h
@@ -48,8 +48,8 @@ namespace CIAO{
///This method takes a <CORBA::string> and an
///<XMLSchema::string> and stores the value from
///the <XMLSchema::string> in the <CORBA::string>.
- static void get_string (Corba::string& str,
- XMLSchema::string& desc);
+ static CORBA::String_var& get_string (CORBA::String_var& str,
+ XMLSchema::string<char>& desc);
};