Imported Upstream version 1.7.2+dfsg

1 files changed, 11 insertions, 2 deletions

diff --git a/bindings/swig/sword.i b/bindings/swig/sword.i
index e0fe6c3..a963fa1 100644
--- a/bindings/swig/sword.i
+++ b/bindings/swig/sword.i
@@ -6,21 +6,30 @@
 /* Ignore warnings about Unknown base class */
 %warnfilter(401);
 
+%include "deprecations.i"
+
 #ifdef SWIGPYTHON
 %include "directors.i"
 #endif
 
+/* Some renames for sanity */
+%ignore *::operator SWBuf;
+
 /* Some generic ignores. These don't map into any Python operators */
 %ignore *::operator=;
 %ignore *::operator++;
 %ignore *::operator--;
-%ignore *::operator const char *;
 %ignore *::operator sword::SWKey &;
 %ignore *::operator sword::SWKey *;
+/* An ignore for missing wchar_t compatibility */
+%ignore sword::SWBuf::append(wchar_t);
 
 %include "defs.i"
 %include "swbuf.i"
 
+%include "multimapwdef.i"
+
+
 /* Now include all the STL templates we are going to use */
 %include "templates.i"
 
@@ -89,7 +98,7 @@
 %include "swlog.i"
 
 #ifndef EXCLUDE_FTP
-%include "ftptrans.i"
+%include "remotetrans.i"
 
 #ifndef EXCLUDE_INSTALLMGR
 %include "installmgr.i"