Merge branch 'demi-rluddy-golang-unsigned-signed-char-not-string'
* demi-rluddy-golang-unsigned-signed-char-not-string: Revert reference change; update CHANGES.current Removed golang stringing for signed/unsigned char Conflicts: CHANGES.current
This commit is contained in:
commit
00ca9c07d1
2 changed files with 21 additions and 23 deletions
|
|
@ -42,6 +42,19 @@ Version 3.0.8 (in progress)
|
|||
2015-09-04: olly
|
||||
[Python] Fix docstrings for %callback functions.
|
||||
|
||||
2015-09-03: demi-rluddy
|
||||
[Go] Removed golang stringing for signed/unsigned char
|
||||
|
||||
Changed default handling of signed char* and unsigned char* to be
|
||||
opaque pointers rather than strings, similarly to how other
|
||||
languages work.
|
||||
|
||||
Any existing code relying on treating signed char* or unsigned
|
||||
char* as a string can restore the old behavior with typemaps.i by
|
||||
using %apply to copy the [unchanged] char* behavior.
|
||||
|
||||
*** POTENTIAL INCOMPATIBILITY ***
|
||||
|
||||
2015-08-07: talby
|
||||
[Perl] tidy -Wtautological-constant-out-of-range-compare warnings when building generated code under clang
|
||||
|
||||
|
|
|
|||
|
|
@ -426,10 +426,7 @@
|
|||
/* Strings. */
|
||||
|
||||
%typemap(gotype)
|
||||
char *, char *&, char[ANY], char[],
|
||||
signed char *, signed char *&, signed char[ANY], signed char[],
|
||||
unsigned char *, unsigned char *&, unsigned char[ANY], unsigned char[]
|
||||
"string"
|
||||
char *, char *&, char[ANY], char[] "string"
|
||||
|
||||
/* Needed to avoid confusion with the way the go module handles
|
||||
references. */
|
||||
|
|
@ -437,46 +434,34 @@
|
|||
%typemap(gotype) signed char& "*int8"
|
||||
|
||||
%typemap(in)
|
||||
char *, char[ANY], char[],
|
||||
signed char *, signed char[ANY], signed char[],
|
||||
unsigned char *, unsigned char[ANY], unsigned char[]
|
||||
char *, char[ANY], char[]
|
||||
%{ $1 = ($1_ltype)$input.p; %}
|
||||
|
||||
%typemap(in) char *&, signed char *&, unsigned char *&
|
||||
%typemap(in) char *&
|
||||
%{ $1 = ($1_ltype)$input.p; %}
|
||||
|
||||
%typemap(out,fragment="AllocateString")
|
||||
char *, char *&, char[ANY], char[],
|
||||
signed char *, signed char *&, signed char[ANY], signed char[],
|
||||
unsigned char *, unsigned char *&, unsigned char[ANY], unsigned char[]
|
||||
char *, char *&, char[ANY], char[]
|
||||
%{ $result = Swig_AllocateString((char*)$1, $1 ? strlen((char*)$1) : 0); %}
|
||||
|
||||
%typemap(goout,fragment="CopyString")
|
||||
char *, char *&, char[ANY], char[],
|
||||
signed char *, signed char *&, signed char[ANY], signed char[],
|
||||
unsigned char *, unsigned char *&, unsigned char[ANY], unsigned char[]
|
||||
char *, char *&, char[ANY], char[]
|
||||
%{ $result = swigCopyString($1) %}
|
||||
|
||||
%typemap(directorin,fragment="AllocateString")
|
||||
char *, char *&, char[ANY], char[],
|
||||
signed char *, signed char *&, signed char[ANY], signed char[],
|
||||
unsigned char *, unsigned char *&, unsigned char[ANY], unsigned char[]
|
||||
char *, char *&, char[ANY], char[]
|
||||
%{
|
||||
$input = Swig_AllocateString((char*)$1, $1 ? strlen((char*)$1) : 0);
|
||||
%}
|
||||
|
||||
%typemap(godirectorin,fragment="CopyString")
|
||||
char *, char *&, char[ANY], char[],
|
||||
signed char *, signed char *&, signed char[ANY], signed char[],
|
||||
unsigned char *, unsigned char *&, unsigned char[ANY], unsigned char[]
|
||||
char *, char *&, char[ANY], char[]
|
||||
%{
|
||||
$result = swigCopyString($input)
|
||||
%}
|
||||
|
||||
%typemap(directorout)
|
||||
char *, char *&, char[ANY], char[],
|
||||
signed char *, signed char *&, signed char[ANY], signed char[],
|
||||
unsigned char *, unsigned char *&, unsigned char[ANY], unsigned char[]
|
||||
char *, char *&, char[ANY], char[]
|
||||
%{ $result = ($1_ltype)$input.p; %}
|
||||
|
||||
/* String & length */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue