Merge branch 'master' into SFbug1299
This commit is contained in:
commit
d5d7655544
14 changed files with 254 additions and 225 deletions
|
|
@ -4256,8 +4256,13 @@ public:
|
|||
Wrapper *w = NewWrapper();
|
||||
|
||||
if (Len(package_path) > 0)
|
||||
if (Len(getNSpace()) > 0)
|
||||
if (Len(getNSpace()) > 0) {
|
||||
internal_classname = NewStringf("%s/%s/%s", package_path, getNSpace(), classname);
|
||||
|
||||
// If the namespace is multiple levels, the result of getNSpace() will have inserted
|
||||
// .'s to delimit namespaces, so we need to replace those with /'s
|
||||
Replace(internal_classname, ".", "/", DOH_REPLACE_ANY);
|
||||
}
|
||||
else
|
||||
internal_classname = NewStringf("%s/%s", package_path, classname);
|
||||
else
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue