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

Revert typemaps changes for member variables (and static members and globals for some languages ).

Browse source 
The typemaps were changed to use const ref typemaps (C++ only, not C).
Inconsistency removed and the pointer typemaps used again.


git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@5890 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
William S Fulton 2004-04-26 20:24:18 +00:00
commit be3e61a82c
2 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
CHANGES.current
View file

@ -1,6 +1,15 @@
Version 1.3.22 (in progress) Version 1.3.22 (in progress)
================================== ==================================
04/25/2004: wsfulton
Change entry 03/21/2004 revoked. The change introduced another
inconsistency (reference typemaps beings used instead of
pointer typemaps for member variables as well as static
member variables and global variables for some languages,
but only for C++ and not C). This would break user's current
typemaps and introduce further inconsistencies. Alternative
solution required and being discussed.
04/10/2004: mmatus (Marcelo Matus) 04/10/2004: mmatus (Marcelo Matus)
Added the -directors flag. This enables the director Added the -directors flag. This enables the director
@ -134,6 +143,7 @@ Version 1.3.22 (in progress)
enum Foo {}; enum Foo {};
03/21/2004: mmatus 03/21/2004: mmatus
[Note: this change revoked on 04/25/2004]
[Python] Makes the following 'var' cases more uniform: [Python] Makes the following 'var' cases more uniform:
std::string ga; std::string ga;

6
Source/Modules/lang.cxx
View file

@ -1192,8 +1192,7 @@ Language::membervariableHandler(Node *n) {
target = NewStringf("%s->%s", Swig_cparm_name(0,0),name); target = NewStringf("%s->%s", Swig_cparm_name(0,0),name);
tm = Swig_typemap_lookup_new("memberin",n,target,0); tm = Swig_typemap_lookup_new("memberin",n,target,0);
} }
int VarRef = CPlusPlus ? CWRAP_VAR_REFERENCE : 0; Swig_MembersetToFunction(n,ClassType,Extend | SmartPointer);
Swig_MembersetToFunction(n,ClassType,Extend | SmartPointer| VarRef);
if (!Extend) { if (!Extend) {
/* Check for a member in typemap here */ /* Check for a member in typemap here */
@ -1226,8 +1225,7 @@ Language::membervariableHandler(Node *n) {
} }
/* Emit get function */ /* Emit get function */
{ {
int VarRef = CPlusPlus ? CWRAP_VAR_REFERENCE : 0; Swig_MembergetToFunction(n,ClassType,Extend | SmartPointer);
Swig_MembergetToFunction(n,ClassType,Extend | SmartPointer| VarRef);
Setattr(n,"sym:name", mrename_get); Setattr(n,"sym:name", mrename_get);
functionWrapper(n); functionWrapper(n);
} }