From: <wsf...@us...> - 2008-06-02 20:15:40
|
Revision: 10516 http://swig.svn.sourceforge.net/swig/?rev=10516&view=rev Author: wsfulton Date: 2008-06-02 13:15:39 -0700 (Mon, 02 Jun 2008) Log Message: ----------- Fix enums when using -noproxy Modified Paths: -------------- trunk/CHANGES.current trunk/Source/Modules/csharp.cxx trunk/Source/Modules/java.cxx Modified: trunk/CHANGES.current =================================================================== --- trunk/CHANGES.current 2008-06-02 20:10:40 UTC (rev 10515) +++ trunk/CHANGES.current 2008-06-02 20:15:39 UTC (rev 10516) @@ -1,6 +1,9 @@ Version 1.3.36 (in progress) ============================= +06/02/2008: wsfulton + [Java, C#] Fix enum wrappers when using -noproxy. + 05/30/2008: bhy Added std::wstring into Lib/typemaps/primtypes.swg, since it is also a primitive type in SWIG - fixed SF #1976978. Modified: trunk/Source/Modules/csharp.cxx =================================================================== --- trunk/Source/Modules/csharp.cxx 2008-06-02 20:10:40 UTC (rev 10515) +++ trunk/Source/Modules/csharp.cxx 2008-06-02 20:15:39 UTC (rev 10516) @@ -2758,7 +2758,7 @@ value = Getattr(n, "enumvalue") ? Copy(Getattr(n, "enumvalue")) : Copy(Getattr(n, "enumvalueex")); } else { // Get the enumvalue from a PINVOKE call - if (!getCurrentClass() || !cparse_cplusplus) { + if (!getCurrentClass() || !cparse_cplusplus || !proxy_flag) { // Strange hack to change the name Setattr(n, "name", Getattr(n, "value")); /* for wrapping of enums in a namespace when emit_action is used */ constantWrapper(n); Modified: trunk/Source/Modules/java.cxx =================================================================== --- trunk/Source/Modules/java.cxx 2008-06-02 20:10:40 UTC (rev 10515) +++ trunk/Source/Modules/java.cxx 2008-06-02 20:15:39 UTC (rev 10516) @@ -2633,7 +2633,7 @@ value = Getattr(n, "enumvalue") ? Copy(Getattr(n, "enumvalue")) : Copy(Getattr(n, "enumvalueex")); } else { // Get the enumvalue from a JNI call - if (!getCurrentClass() || !cparse_cplusplus) { + if (!getCurrentClass() || !cparse_cplusplus || !proxy_flag) { // Strange hack to change the name Setattr(n, "name", Getattr(n, "value")); /* for wrapping of enums in a namespace when emit_action is used */ constantWrapper(n); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |