jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

D: Fix class/method name ambiguity in test-suite/c_delete.i.

Browse source 
There might be other cases where this happens when $dclassname
is used for code emitted into the proxy class itself, but so
far, there are none in the test suite or any bug reports.
This commit is contained in:
David Nadlinger 2014-10-25 22:34:42 +02:00
commit 95e8db7c62
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Lib/d/boost_shared_ptr.i
View file

@ -152,7 +152,7 @@ public this(void* cObject, bool ownCObject) {
swigCMemOwn = ownCObject; swigCMemOwn = ownCObject;
} }
public static void* swigGetCPtr($dclassname obj) { public static void* swigGetCPtr(typeof(this) obj) {
return (obj is null) ? null : obj.swigCPtr; return (obj is null) ? null : obj.swigCPtr;
} }
%} %}
@ -167,7 +167,7 @@ public this(void* cObject, bool ownCObject) {
swigCMemOwn = ownCObject; swigCMemOwn = ownCObject;
} }
public static void* swigGetCPtr($dclassname obj) { public static void* swigGetCPtr(typeof(this) obj) {
return (obj is null) ? null : obj.swigCPtr; return (obj is null) ? null : obj.swigCPtr;
} }
%} %}

8
Lib/d/dclassgen.swg
View file

@ -72,7 +72,7 @@ public this(void* cObject, bool ownCObject) {
swigCMemOwn = ownCObject; swigCMemOwn = ownCObject;
} }
public static void* swigGetCPtr($dclassname obj) { public static void* swigGetCPtr(typeof(this) obj) {
return (obj is null) ? null : obj.swigCPtr; return (obj is null) ? null : obj.swigCPtr;
} }
@ -88,7 +88,7 @@ public this(void* cObject, bool ownCObject) {
swigCPtr = cObject; swigCPtr = cObject;
} }
public static void* swigGetCPtr($dclassname obj) { public static void* swigGetCPtr(typeof(this) obj) {
return (obj is null) ? null : obj.swigCPtr; return (obj is null) ? null : obj.swigCPtr;
} }
@ -111,7 +111,7 @@ protected this() {
swigCPtr = null; swigCPtr = null;
} }
public static void* swigGetCPtr($dclassname obj) { public static void* swigGetCPtr(typeof(this) obj) {
return (obj is null) ? null : obj.swigCPtr; return (obj is null) ? null : obj.swigCPtr;
} }
@ -134,7 +134,7 @@ protected this() {
swigCPtr = null; swigCPtr = null;
} }
package static char* swigGetCMemberPtr($dclassname obj) { package static char* swigGetCMemberPtr(typeof(this) obj) {
return (obj is null) ? null : obj.swigCPtr; return (obj is null) ? null : obj.swigCPtr;
} }