| Index: tools/clang/rewrite_to_chrome_style/RewriteToChromeStyle.cpp
|
| diff --git a/tools/clang/rewrite_to_chrome_style/RewriteToChromeStyle.cpp b/tools/clang/rewrite_to_chrome_style/RewriteToChromeStyle.cpp
|
| index 3607731f3699aefa6ff2f897e5f272e4f838a26e..e91153a4646bd26418b14a2eeaaab37f4ed2bcb2 100644
|
| --- a/tools/clang/rewrite_to_chrome_style/RewriteToChromeStyle.cpp
|
| +++ b/tools/clang/rewrite_to_chrome_style/RewriteToChromeStyle.cpp
|
| @@ -375,6 +375,13 @@ bool GetNameForDecl(const clang::VarDecl& decl,
|
| name[1] = clang::toUppercase(name[1]);
|
| } else {
|
| name = CamelCaseToUnderscoreCase(original_name);
|
| +
|
| + // Non-const variables with static storage duration at namespace scope are
|
| + // prefixed with `g_' to reduce the likelihood of a naming collision.
|
| + const clang::DeclContext* decl_context = decl.getDeclContext();
|
| + if (name.find("g_") != 0 && decl.hasGlobalStorage() &&
|
| + decl_context->isNamespace())
|
| + name.insert(0, "g_");
|
| }
|
|
|
| // Static members end with _ just like other members, but constants should
|
|
|