Made string typemaps handle strings with embedded nulls. Changed to use

cstring::data() instead of c_str() to avoid a possible copy.  (Ollie Betts)


git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@8147 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Kevin Ruland 2005-12-31 03:15:12 +00:00
commit a961a7d5f2

View file

@ -25,21 +25,21 @@ namespace std {
%typemap(in) string {
convert_to_string_ex($input);
$1 = std::string(Z_STRVAL_PP($input));
$1 = std::string(Z_STRVAL_PP($input),Z_STRLEN_PP($input));
}
%typemap(in) const string & (std::string temp) {
convert_to_string_ex($input);
temp = std::string(Z_STRVAL_PP($input));
temp = std::string(Z_STRVAL_PP($input),Z_STRLEN_PP($input));
$1 = &temp;
}
%typemap(out) string {
ZVAL_STRINGL($result,const_cast<char*>($1.c_str()),$1.length(),1);
ZVAL_STRINGL($result,const_cast<char*>($1.data()),$1.length(),1);
}
%typemap(out) const string & {
ZVAL_STRINGL($result,const_cast<char*>($1->c_str()),$1->length(),1);
ZVAL_STRINGL($result,const_cast<char*>($1->data()),$1->length(),1);
}
%typemap(throws) string %{