From aefb8559dca283b81d20a3f40afc8f39e6161ecb Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Tue, 7 Aug 2018 08:18:25 -0400
Subject: IWYU: Fix workaround mapping for std::hash

It is provided by `functional`, not `utility`.  Fix the mapping added by
commit 276d3c7afe (IWYU: Add workaround mapping for std::hash,
2018-07-31).  Also generalize the workaround from commit v3.12.0-rc1~39^2~1
(IWYU: Define a macro to tell code it is preprocessing for iwyu,
2018-05-25) to allow local builds to configure specific flags.  This
is needed because iwyu behaves differently in different environments.
---
 Utilities/IWYU/mapping.imp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Utilities/IWYU')

diff --git a/Utilities/IWYU/mapping.imp b/Utilities/IWYU/mapping.imp
index 77bb572211..5af8b85dd0 100644
--- a/Utilities/IWYU/mapping.imp
+++ b/Utilities/IWYU/mapping.imp
@@ -53,7 +53,7 @@
   #{ symbol: [ "std::pair", private, "<set>", public ] },
 
   # HACK: iwyu wrongly thinks that <system_error> is needed for std::hash
-  { symbol: [ "std::hash", private, "<utility>", public ] },
+  { symbol: [ "std::hash", private, "<functional>", public ] },
 
   # __decay_and_strip is used internally in the C++11 standard library.
   # IWYU does not classify it as internal and suggests to add <type_traits>.
-- 
cgit v1.2.1