Merge pull request google#158 from lhchavez/iwyu

eglaysher · web-flow · commit 8b263179f2df · 2016-07-13T10:15:49.000-07:00
Make build/include_what_you_use more consistent
diff --git a/cpplint/cpplint.py b/cpplint/cpplint.py
@@ -5433,8 +5433,13 @@ def CheckForIncludeWhatYouUse(filename, clean_lines, include_state, error,
       continue
 
     for pattern, template, header in _re_pattern_templates:
-      if pattern.search(line):
-        required[header] = (linenum, template)
+      matched = pattern.search(line)
+      if matched:
+        # Don't warn about IWYU in non-STL namespaces:
+        # (We check only the first match per line; good enough.)
+        prefix = line[:matched.start()]
+        if prefix.endswith('std::') or not prefix.endswith('::'):
+          required[header] = (linenum, template)
 
   # The policy is that if you #include something in foo.h you don't need to
   # include it again in foo.cc. Here, we will look at possible includes.
diff --git a/cpplint/cpplint_unittest.py b/cpplint/cpplint_unittest.py
@@ -949,6 +949,11 @@ def testIncludeWhatYouUse(self):
         """,
         'Add #include <hash_map> for hash_map<>'
         '  [build/include_what_you_use] [4]')
+    self.TestIncludeWhatYouUse(
+        """#include "base/containers/hash_tables.h"
+          base::hash_map<int, int> foobar;
+        """,
+        '')
     self.TestIncludeWhatYouUse(
         """#include "base/foobar.h"
            bool foobar = std::less<int>(0,1);
