summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjules <jules@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2004-08-30 20:51:54 +0000
committerjules <jules@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2004-08-30 20:51:54 +0000
commit2e96e654e1b0da4a7a4418152d3f42cbbd18c436 (patch)
treeafda897e72107b1625a0470e27739a413798a13c
parent14f7d85a678a79cb8c505b86d93a82663a4fa276 (diff)
downloadATCD-2e96e654e1b0da4a7a4418152d3f42cbbd18c436.tar.gz
*** empty log message ***
-rw-r--r--TAO/CIAO/DAnCE/Config_Handlers/BaseTypes_Handler.cpp17
-rw-r--r--TAO/CIAO/DAnCE/Config_Handlers/BaseTypes_Handler.h9
2 files changed, 12 insertions, 14 deletions
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/BaseTypes_Handler.cpp b/TAO/CIAO/DAnCE/Config_Handlers/BaseTypes_Handler.cpp
index 8920a443c95..8590c1069f2 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/BaseTypes_Handler.cpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/BaseTypes_Handler.cpp
@@ -7,16 +7,15 @@ CIAO::Config_Handlers::BaseTypes_Handler::BaseTypes_Handler()
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>.
-CORBA::String_var&
-CIAO::Config_Handlers::BaseTypes_Handler::get_string (CORBA::String_var& str,
- XMLSchema::string<char>& desc)
+///This method takes a <XMLSchema::string>
+///and returns a duplicate char* that is
+///created with CORBA::string_dup.
+char*
+CIAO::Config_Handlers::BaseTypes_Handler::get_string (XMLSchema::string<char>& desc)
{
- //Convert duplicate the XMLSchema::string and
- //assign it to the Corba::string.
- str = CORBA::string_dup(desc.c_str());
+ //Convert duplicate the XMLSchema::string into
+ //a char*. The caller receives ownership of the pointer.
+ char* 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 884adbfb893..904cc7a99f7 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/BaseTypes_Handler.h
+++ b/TAO/CIAO/DAnCE/Config_Handlers/BaseTypes_Handler.h
@@ -45,11 +45,10 @@ namespace CIAO{
BaseTypes_Handler();
virtual ~BaseTypes_Handler();
- ///This method takes a <CORBA::string> and an
- ///<XMLSchema::string> and stores the value from
- ///the <XMLSchema::string> in the <CORBA::string>.
- static CORBA::String_var& get_string (CORBA::String_var& str,
- XMLSchema::string<char>& desc);
+ ///This method takes a <XMLSchema::string>
+ ///and returns a duplicate char* that is
+ ///created with CORBA::string_dup.
+ static char* get_string (XMLSchema::string<char>& desc);
};