Index: presubmit_canned_checks.py |
diff --git a/presubmit_canned_checks.py b/presubmit_canned_checks.py |
index bd628fb3665c4cc289f22c02c91a5510348eb1c0..59e7be242fc5766bbc983406a75127d46cd867de 100644 |
--- a/presubmit_canned_checks.py |
+++ b/presubmit_canned_checks.py |
@@ -977,6 +977,11 @@ def CheckSingletonInHeaders(input_api, output_api, source_file_filter=None): |
for f in input_api.AffectedSourceFiles(source_file_filter): |
if (f.LocalPath().endswith('.h') or f.LocalPath().endswith('.hxx') or |
f.LocalPath().endswith('.hpp') or f.LocalPath().endswith('.inl')): |
+ # It's ok for base/memory/singleton.h to have |Singleton<|. |
+ singleton_h_path = input_api.os_path.join( |
+ 'base', 'memory', 'singleton.h') |
M-A Ruel
2015/02/13 17:04:17
You can't hardcode src.git paths here.
|
+ if f.LocalPath().endswith(singleton_h_path): |
+ break |
contents = input_api.ReadFile(f) |
for line in contents.splitlines(False): |
if (not input_api.re.match(r'//', line) and # Strip C++ comment. |