aboutsummaryrefslogtreecommitdiff
path: root/Lib/d
diff options
context:
space:
mode:
authorDavid Nadlinger <code@klickverbot.at>2014-10-25 22:34:42 +0200
committerDavid Nadlinger <code@klickverbot.at>2014-11-06 23:04:35 +0100
commit95e8db7c6232d0ffab55d291e2b23d9b9abb70ac (patch)
tree67406b4c0ab56c0913a4d94b708a934cab616042 /Lib/d
parent2faef96e0a19dfb9206e1acdf14567293932808c (diff)
downloadswig-95e8db7c6232d0ffab55d291e2b23d9b9abb70ac.tar.gz
D: Fix class/method name ambiguity in test-suite/c_delete.i.
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.
Diffstat (limited to 'Lib/d')
-rw-r--r--Lib/d/boost_shared_ptr.i4
-rw-r--r--Lib/d/dclassgen.swg8
2 files changed, 6 insertions, 6 deletions
diff --git a/Lib/d/boost_shared_ptr.i b/Lib/d/boost_shared_ptr.i
index bfa2aa646..5c171555e 100644
--- a/Lib/d/boost_shared_ptr.i
+++ b/Lib/d/boost_shared_ptr.i
@@ -152,7 +152,7 @@ public this(void* cObject, bool ownCObject) {
swigCMemOwn = ownCObject;
}
-public static void* swigGetCPtr($dclassname obj) {
+public static void* swigGetCPtr(typeof(this) obj) {
return (obj is null) ? null : obj.swigCPtr;
}
%}
@@ -167,7 +167,7 @@ public this(void* cObject, bool ownCObject) {
swigCMemOwn = ownCObject;
}
-public static void* swigGetCPtr($dclassname obj) {
+public static void* swigGetCPtr(typeof(this) obj) {
return (obj is null) ? null : obj.swigCPtr;
}
%}
diff --git a/Lib/d/dclassgen.swg b/Lib/d/dclassgen.swg
index ceaf50727..68910b412 100644
--- a/Lib/d/dclassgen.swg
+++ b/Lib/d/dclassgen.swg
@@ -72,7 +72,7 @@ public this(void* cObject, bool ownCObject) {
swigCMemOwn = ownCObject;
}
-public static void* swigGetCPtr($dclassname obj) {
+public static void* swigGetCPtr(typeof(this) obj) {
return (obj is null) ? null : obj.swigCPtr;
}
@@ -88,7 +88,7 @@ public this(void* cObject, bool ownCObject) {
swigCPtr = cObject;
}
-public static void* swigGetCPtr($dclassname obj) {
+public static void* swigGetCPtr(typeof(this) obj) {
return (obj is null) ? null : obj.swigCPtr;
}
@@ -111,7 +111,7 @@ protected this() {
swigCPtr = null;
}
-public static void* swigGetCPtr($dclassname obj) {
+public static void* swigGetCPtr(typeof(this) obj) {
return (obj is null) ? null : obj.swigCPtr;
}
@@ -134,7 +134,7 @@ protected this() {
swigCPtr = null;
}
-package static char* swigGetCMemberPtr($dclassname obj) {
+package static char* swigGetCMemberPtr(typeof(this) obj) {
return (obj is null) ? null : obj.swigCPtr;
}