diff options
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/config/makeprops.py | 9 | ||||
| -rw-r--r-- | cpp/src/Ice/PropertyNames.h | 4 |
2 files changed, 9 insertions, 4 deletions
diff --git a/cpp/config/makeprops.py b/cpp/config/makeprops.py index 355f0a2a249..d3fc8d46ad1 100644 --- a/cpp/config/makeprops.py +++ b/cpp/config/makeprops.py @@ -86,8 +86,8 @@ public: """ cppHeaderPostamble = """ - static const PropertyArray IceInternal::%(classname)s::validProps[]; - static const char * IceInternal::%(classname)s::clPropNames[]; + static const PropertyArray validProps[]; + static const char * clPropNames[]; }; } @@ -661,7 +661,12 @@ def main(): infile = None lang = None + toplevel = '..' + # + # TODO: Why does determining the top level directory depend on which + # arguments are used? + # if len(sys.argv) == 1: # # Find where the root of the tree is. diff --git a/cpp/src/Ice/PropertyNames.h b/cpp/src/Ice/PropertyNames.h index 8196579820b..aa4b136a159 100644 --- a/cpp/src/Ice/PropertyNames.h +++ b/cpp/src/Ice/PropertyNames.h @@ -68,8 +68,8 @@ public: static const PropertyArray Glacier2Props; static const PropertyArray FreezeProps; - static const PropertyArray IceInternal::PropertyNames::validProps[]; - static const char * IceInternal::PropertyNames::clPropNames[]; + static const PropertyArray validProps[]; + static const char * clPropNames[]; }; } |