Attachment 479749 Details for Bug 535200

[patch] perl-bindings.patch

perl-bindings.patch (text/plain), 1.13 KB, created by Martin Vidner on 2012-03-06 14:14:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Vidner

Created: 2012-03-06 14:14:41 UTC

Size: 1.13 KB

patch

obsolete

>Index: pluglib-bindings/swig/stl/string.i
>===================================================================
>--- pluglib-bindings/swig/stl/string.i	(revision 67536)
>+++ pluglib-bindings/swig/stl/string.i	(working copy)
>@@ -31,8 +31,15 @@
>     const std::string* (std::string temp), const std::string& (std::string temp)
> {
>     SV *sv;
>-    if (!SvROK($input) || !(sv = (SV*)SvRV($input)) || !SvPOK(sv) )
>-	SWIG_croak("Type error in argument $argnum of $symname. Expected a REFERENCE to STRING.\n");
>+    /*support string by value and also by reference */
>+    if (SvPOK($input))
>+    { /* we get string value */
>+        sv = $input;
>+    }
>+    else if (!SvROK($input) || !(sv = (SV*)SvRV($input)) || !SvPOK(sv) )
>+    {
>+        SWIG_croak("Type error in argument $argnum of $symname. Expected a REFERENCE to STRING or STRING.\n");
>+    }
> 
>     STRLEN len;
>     const char *ptr = SvPV(sv, len);
>@@ -52,7 +59,9 @@
> 
> %typemap(argout) std::string*, std::string&
> {
>-    SV *sv = (SV *)SvRV($input);
>+    SV *sv = $input;
>+    if (SvROK($input)) /* input can be reference of bare string */
>+      sv = (SV *)SvRV($input);
>     sv_setpv(sv, $1->c_str());
> }
>

Actions: View | Diff

Attachments on bug 535200: 315998 | 479749