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

Strengthened test for const static members.

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@4716 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Dave Beazley 2003-04-28 18:49:38 +00:00
commit cab5d37641
1 changed files with 17 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Source/Modules/lang.cxx
View file

@ -1194,7 +1194,9 @@ Language::staticmembervariableHandler(Node *n)
{ {
Swig_require("staticmembervariableHandler",n,"*name","*sym:name","*type", "?value", NIL); Swig_require("staticmembervariableHandler",n,"*name","*sym:name","*type", "?value", NIL);
String *value = Getattr(n,"value"); String *value = Getattr(n,"value");
if (!value) { SwigType *type = SwigType_typedef_resolve_all(Getattr(n,"type"));
if (!value || !(SwigType_isconst(type))) {
String *name = Getattr(n,"name"); String *name = Getattr(n,"name");
String *symname = Getattr(n,"sym:name"); String *symname = Getattr(n,"sym:name");
String *cname, *mrename; String *cname, *mrename;
@ -1212,6 +1214,19 @@ Language::staticmembervariableHandler(Node *n)
Delete(mrename); Delete(mrename);
Delete(cname); Delete(cname);
} else { } else {
/* This is a C++ static member declaration with an initializer and it's const.
Certain C++ compilers optimize this out so that there is no linkage to a
memory address. Example:
class Foo {
public:
static const int x = 3;
};
Some discussion of this in section 9.4 of the C++ draft standard. */
String *name = Getattr(n,"name"); String *name = Getattr(n,"name");
String *cname = NewStringf("%s::%s", ClassName,name); String *cname = NewStringf("%s::%s", ClassName,name);
String* value = SwigType_namestr(cname); String* value = SwigType_namestr(cname);
@ -1227,6 +1242,7 @@ Language::staticmembervariableHandler(Node *n)
Delete(cname); Delete(cname);
} }
Delete(type);
Swig_restore(n); Swig_restore(n);
return SWIG_OK; return SWIG_OK;
} }