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

Apply #3502431 to fix duplicate symbols in multiple modules and compiler errors due to lack of const in some methods taking char*.

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@12948 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
William S Fulton 2012-03-24 01:01:06 +00:00
commit cd770b27ff
3 changed files with 18 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES.current
View file

@ -5,6 +5,10 @@ See the RELEASENOTES file for a summary of changes in each release.
Version 2.0.5 (in progress) Version 2.0.5 (in progress)
=========================== ===========================
2012-03-24: wsfulton
[D] Apply #3502431 to fix duplicate symbols in multiple modules and compiler errors due to lack
of const in some methods taking char*.
2012-03-21: wsfulton 2012-03-21: wsfulton
Fix #3494791 - %$isglobal for %rename matching. Fix #3494791 - %$isglobal for %rename matching.

20
Lib/d/dhead.swg
View file

@ -83,7 +83,7 @@ static import tango.stdc.stringz;
%pragma(d) imdmodulecode=%{ %pragma(d) imdmodulecode=%{
private class SwigExceptionHelper { private class SwigExceptionHelper {
static this() { static this() {
swigRegisterExceptionCallbacks( swigRegisterExceptionCallbacks$module(
&setException, &setException,
&setIllegalArgumentException, &setIllegalArgumentException,
&setIllegalElementException, &setIllegalElementException,
@ -91,31 +91,31 @@ private class SwigExceptionHelper {
&setNoSuchElementException); &setNoSuchElementException);
} }
static void setException(char* message) { static void setException(const char* message) {
auto exception = new object.Exception(tango.stdc.stringz.fromStringz(message).dup); auto exception = new object.Exception(tango.stdc.stringz.fromStringz(message).dup);
exception.next = SwigPendingException.retrieve(); exception.next = SwigPendingException.retrieve();
SwigPendingException.set(exception); SwigPendingException.set(exception);
} }
static void setIllegalArgumentException(char* message) { static void setIllegalArgumentException(const char* message) {
auto exception = new tango.core.Exception.IllegalArgumentException(tango.stdc.stringz.fromStringz(message).dup); auto exception = new tango.core.Exception.IllegalArgumentException(tango.stdc.stringz.fromStringz(message).dup);
exception.next = SwigPendingException.retrieve(); exception.next = SwigPendingException.retrieve();
SwigPendingException.set(exception); SwigPendingException.set(exception);
} }
static void setIllegalElementException(char* message) { static void setIllegalElementException(const char* message) {
auto exception = new tango.core.Exception.IllegalElementException(tango.stdc.stringz.fromStringz(message).dup); auto exception = new tango.core.Exception.IllegalElementException(tango.stdc.stringz.fromStringz(message).dup);
exception.next = SwigPendingException.retrieve(); exception.next = SwigPendingException.retrieve();
SwigPendingException.set(exception); SwigPendingException.set(exception);
} }
static void setIOException(char* message) { static void setIOException(const char* message) {
auto exception = new tango.core.Exception.IOException(tango.stdc.stringz.fromStringz(message).dup); auto exception = new tango.core.Exception.IOException(tango.stdc.stringz.fromStringz(message).dup);
exception.next = SwigPendingException.retrieve(); exception.next = SwigPendingException.retrieve();
SwigPendingException.set(exception); SwigPendingException.set(exception);
} }
static void setNoSuchElementException(char* message) { static void setNoSuchElementException(const char* message) {
auto exception = new tango.core.Exception.NoSuchElementException(tango.stdc.stringz.fromStringz(message).dup); auto exception = new tango.core.Exception.NoSuchElementException(tango.stdc.stringz.fromStringz(message).dup);
exception.next = SwigPendingException.retrieve(); exception.next = SwigPendingException.retrieve();
SwigPendingException.set(exception); SwigPendingException.set(exception);
@ -174,7 +174,7 @@ private:
alias tango.core.Thread.ThreadLocal!(object.Exception) ThreadLocalData; alias tango.core.Thread.ThreadLocal!(object.Exception) ThreadLocalData;
static ThreadLocalData m_sPendingException; static ThreadLocalData m_sPendingException;
} }
alias void function(char* message) SwigExceptionCallback; alias void function(const char* message) SwigExceptionCallback;
%} %}
#else #else
%pragma(d) imdmoduleimports=%{ %pragma(d) imdmoduleimports=%{
@ -185,7 +185,7 @@ static import std.conv;
private class SwigExceptionHelper { private class SwigExceptionHelper {
static this() { static this() {
// The D1/Tango version maps C++ exceptions to multiple exception types. // The D1/Tango version maps C++ exceptions to multiple exception types.
swigRegisterExceptionCallbacks( swigRegisterExceptionCallbacks$module(
&setException, &setException,
&setException, &setException,
&setException, &setException,
@ -283,7 +283,7 @@ SWIGEXPORT void SWIGRegisterStringCallback_$module(SWIG_DStringHelperCallback ca
%pragma(d) imdmodulecode = %{ %pragma(d) imdmodulecode = %{
private class SwigStringHelper { private class SwigStringHelper {
static this() { static this() {
swigRegisterStringCallback(&createString); swigRegisterStringCallback$module(&createString);
} }
static char* createString(char* cString) { static char* createString(char* cString) {
@ -302,7 +302,7 @@ static import std.string;
%pragma(d) imdmodulecode = %{ %pragma(d) imdmodulecode = %{
private class SwigStringHelper { private class SwigStringHelper {
static this() { static this() {
swigRegisterStringCallback(&createString); swigRegisterStringCallback$module(&createString);
} }
static const(char)* createString(const(char*) cString) { static const(char)* createString(const(char*) cString) {

8
Lib/d/wrapperloader.swg
View file

@ -282,10 +282,10 @@ static this() {
} }
//#if !defined(SWIG_D_NO_EXCEPTION_HELPER) //#if !defined(SWIG_D_NO_EXCEPTION_HELPER)
mixin(bindCode("swigRegisterExceptionCallbacks", "SWIGRegisterExceptionCallbacks_$module")); mixin(bindCode("swigRegisterExceptionCallbacks$module", "SWIGRegisterExceptionCallbacks_$module"));
//#endif // SWIG_D_NO_EXCEPTION_HELPER //#endif // SWIG_D_NO_EXCEPTION_HELPER
//#if !defined(SWIG_D_NO_STRING_HELPER) //#if !defined(SWIG_D_NO_STRING_HELPER)
mixin(bindCode("swigRegisterStringCallback", "SWIGRegisterStringCallback_$module")); mixin(bindCode("swigRegisterStringCallback$module", "SWIGRegisterStringCallback_$module"));
//#endif // SWIG_D_NO_STRING_HELPER //#endif // SWIG_D_NO_STRING_HELPER
$wrapperloaderbindcode $wrapperloaderbindcode
} }
@ -296,11 +296,11 @@ extern(C) void function(
SwigExceptionCallback illegalArgumentCallback, SwigExceptionCallback illegalArgumentCallback,
SwigExceptionCallback illegalElementCallback, SwigExceptionCallback illegalElementCallback,
SwigExceptionCallback ioCallback, SwigExceptionCallback ioCallback,
SwigExceptionCallback noSuchElementCallback) swigRegisterExceptionCallbacks; SwigExceptionCallback noSuchElementCallback) swigRegisterExceptionCallbacks$module;
//#endif // SWIG_D_NO_EXCEPTION_HELPER //#endif // SWIG_D_NO_EXCEPTION_HELPER
//#if !defined(SWIG_D_NO_STRING_HELPER) //#if !defined(SWIG_D_NO_STRING_HELPER)
extern(C) void function(SwigStringCallback callback) swigRegisterStringCallback; extern(C) void function(SwigStringCallback callback) swigRegisterStringCallback$module;
//#endif // SWIG_D_NO_STRING_HELPER //#endif // SWIG_D_NO_STRING_HELPER
%} %}