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

Revert "Octave: remove unused field SwigOctClass::constructor_doc"

Browse source 
This reverts commit afa9affcd9.

Reverting a series of Octave commits for re-applying again without
incorrect whitespace changes.
This commit is contained in:
William S Fulton 2014-10-09 19:33:40 +01:00
commit a9c9c9c848
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Lib/octave/octrundecl.swg
View file

@ -229,6 +229,7 @@ struct SwigOctClass {
swig_type_info** type; swig_type_info** type;
int director; int director;
SwigOctFuncPtr constructor; SwigOctFuncPtr constructor;
const char* constructor_doc;
SwigOctFuncPtr destructor; SwigOctFuncPtr destructor;
const SwigOctMember* members; const SwigOctMember* members;
const char** base_names; const char** base_names;

6
Source/Modules/octave.cxx
View file

@ -1039,11 +1039,13 @@ public:
String* nspace = Getattr(n, "sym:nspace"); String* nspace = Getattr(n, "sym:nspace");
String* cname = Swig_name_construct(nspace, constructor_name); String* cname = Swig_name_construct(nspace, constructor_name);
String* wcname = Swig_name_wrapper(cname); String* wcname = Swig_name_wrapper(cname);
Printf(f_wrappers, "%s,", wcname); String* tname = texinfo_name(n);
Printf(f_wrappers, "%s,%s,", wcname, tname);
Delete(tname);
Delete(wcname); Delete(wcname);
Delete(cname); Delete(cname);
} else { } else {
Printv(f_wrappers, "0,", NIL); Printv(f_wrappers, "0,0,", NIL);
} }
if (have_destructor) { if (have_destructor) {
String* nspace = Getattr(n, "sym:nspace"); String* nspace = Getattr(n, "sym:nspace");