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

Fix enums when using -noproxy

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@10516 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
William S Fulton 2008-06-02 20:15:39 +00:00
commit dfcd771463
3 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
CHANGES.current
View file

@ -1,6 +1,9 @@
Version 1.3.36 (in progress) Version 1.3.36 (in progress)
============================= =============================
06/02/2008: wsfulton
[Java, C#] Fix enum wrappers when using -noproxy.
05/30/2008: bhy 05/30/2008: bhy
Added std::wstring into Lib/typemaps/primtypes.swg, since it is also a primitive Added std::wstring into Lib/typemaps/primtypes.swg, since it is also a primitive
type in SWIG - fixed SF #1976978. type in SWIG - fixed SF #1976978.

2
Source/Modules/csharp.cxx
View file

@ -2758,7 +2758,7 @@ public:
value = Getattr(n, "enumvalue") ? Copy(Getattr(n, "enumvalue")) : Copy(Getattr(n, "enumvalueex")); value = Getattr(n, "enumvalue") ? Copy(Getattr(n, "enumvalue")) : Copy(Getattr(n, "enumvalueex"));
} else { } else {
// Get the enumvalue from a PINVOKE call // Get the enumvalue from a PINVOKE call
if (!getCurrentClass() || !cparse_cplusplus) { if (!getCurrentClass() || !cparse_cplusplus || !proxy_flag) {
// Strange hack to change the name // Strange hack to change the name
Setattr(n, "name", Getattr(n, "value")); /* for wrapping of enums in a namespace when emit_action is used */ Setattr(n, "name", Getattr(n, "value")); /* for wrapping of enums in a namespace when emit_action is used */
constantWrapper(n); constantWrapper(n);

2
Source/Modules/java.cxx
View file

@ -2633,7 +2633,7 @@ public:
value = Getattr(n, "enumvalue") ? Copy(Getattr(n, "enumvalue")) : Copy(Getattr(n, "enumvalueex")); value = Getattr(n, "enumvalue") ? Copy(Getattr(n, "enumvalue")) : Copy(Getattr(n, "enumvalueex"));
} else { } else {
// Get the enumvalue from a JNI call // Get the enumvalue from a JNI call
if (!getCurrentClass() || !cparse_cplusplus) { if (!getCurrentClass() || !cparse_cplusplus || !proxy_flag) {
// Strange hack to change the name // Strange hack to change the name
Setattr(n, "name", Getattr(n, "value")); /* for wrapping of enums in a namespace when emit_action is used */ Setattr(n, "name", Getattr(n, "value")); /* for wrapping of enums in a namespace when emit_action is used */
constantWrapper(n); constantWrapper(n);