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

Fix attribute definition.

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-c@13103 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Leif Middelschulte 2012-05-22 17:14:59 +00:00
commit 162ed6931a
1 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Source/Modules/c.cxx
View file

@ -291,9 +291,6 @@ public:
virtual int globalfunctionHandler(Node *n) { virtual int globalfunctionHandler(Node *n) {
SwigType *type = Getattr(n, "type"); SwigType *type = Getattr(n, "type");
String *vis_hint = NewString("");
String *return_type_str = SwigType_str(Getattr(n, "type"), 0);
String *name = Getattr(n, "sym:name");
ParmList *parms = Getattr(n, "parms"); ParmList *parms = Getattr(n, "parms");
String *arg_list = NewString(""); String *arg_list = NewString("");
String *call = empty_string; String *call = empty_string;
@ -309,14 +306,9 @@ public:
functionWrapper(n); functionWrapper(n);
// add visibility hint for the compiler (do not override this symbol)
Printv(vis_hint, "SWIGPROTECT(", return_type_str, " ", name, "(", ParmList_str(parms), ");)\n\n", NIL);
Printv(f_header, vis_hint, NIL);
Delete(cres); Delete(cres);
Delete(call); Delete(call);
Delete(arg_list); Delete(arg_list);
Delete(vis_hint);
return SWIG_OK; return SWIG_OK;
} }
@ -416,6 +408,7 @@ ready:
virtual int functionWrapper(Node *n) { virtual int functionWrapper(Node *n) {
String *name = Copy(Getattr(n, "sym:name")); String *name = Copy(Getattr(n, "sym:name"));
String *storage = Getattr(n, "storage"); String *storage = Getattr(n, "storage");
String *vis_hint = NewString("");
SwigType *type = Getattr(n, "type"); SwigType *type = Getattr(n, "type");
SwigType *otype = Copy(type); SwigType *otype = Copy(type);
SwigType *return_type = NewString(""); SwigType *return_type = NewString("");
@ -780,12 +773,16 @@ ready:
Printv(f_proxy_code_body, " return ", wname, "(", arg_names, ");\n}\n", NIL); Printv(f_proxy_code_body, " return ", wname, "(", arg_names, ");\n}\n", NIL);
// add function declaration to the proxy header file // add function declaration to the proxy header file
Printv(f_proxy_header, return_type, " ", name, "(", proto, ");\n"); // add visibility hint for the compiler (do not override this symbol)
Printv(vis_hint, "SWIGPROTECT(", return_type, " ", name, "(", proto, ");)\n\n", NIL);
Printv(f_proxy_header, vis_hint, NIL);
} }
Wrapper_print(wrapper, f_wrappers); Wrapper_print(wrapper, f_wrappers);
// cleanup // cleanup
Delete(vis_hint);
Delete(over_suffix); Delete(over_suffix);
Delete(proto); Delete(proto);
Delete(arg_names); Delete(arg_names);