| Index: tools/json_schema_compiler/cpp_type_generator.py
|
| diff --git a/tools/json_schema_compiler/cpp_type_generator.py b/tools/json_schema_compiler/cpp_type_generator.py
|
| index d485b46c5cdea81ca443c564e34199efd8bfcd60..b9b95bd73fbc0526b3066bed2b395fd65828c2f3 100644
|
| --- a/tools/json_schema_compiler/cpp_type_generator.py
|
| +++ b/tools/json_schema_compiler/cpp_type_generator.py
|
| @@ -64,8 +64,9 @@ class CppTypeGenerator(object):
|
|
|
| e.g VAR_STRING
|
| """
|
| - value = '%s_%s' % (self.FollowRef(type_).unix_name.upper(),
|
| - cpp_util.Classname(enum_value.name.upper()))
|
| + value = cpp_util.Classname(enum_value.name.upper())
|
| + if not type_.absolute:
|
| + value = '%s_%s' % (self.FollowRef(type_).unix_name.upper(), value)
|
| # To avoid collisions with built-in OS_* preprocessor definitions, we add a
|
| # trailing slash to enum names that start with OS_.
|
| if value.startswith("OS_"):
|
|
|