diff options
| author | Brad King <brad.king@kitware.com> | 2017-05-08 14:03:10 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-05-08 14:03:15 (GMT) |
| commit | 22d0a83a4cc2188119e008ed346a10f7b0b32f8e (patch) | |
| tree | f5349a0869c9b7b1a77db33d878ce47769d0c2d0 /Utilities | |
| parent | 141b8ccf2cddc6b5d3c3c7258cefb181c09e5ce9 (diff) | |
| parent | 50dd15af58aa9fd69549f769916955b46fdad4eb (diff) | |
| download | CMake-22d0a83a4cc2188119e008ed346a10f7b0b32f8e.zip CMake-22d0a83a4cc2188119e008ed346a10f7b0b32f8e.tar.gz CMake-22d0a83a4cc2188119e008ed346a10f7b0b32f8e.tar.bz2 | |
Merge topic 'c++11-iwyu'
50dd15af QtDialog: block include-what-you-use
f3e21613 cmServer: include what you use
9535823b IWYU: map system symbols to libuv
6a91ee02 IWYU: add mapping for cm::auto_ptr
7165065f cmInstalledFile: add cmConfigure.h as first #include
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !811
Diffstat (limited to 'Utilities')
| -rw-r--r-- | Utilities/IWYU/mapping.imp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/Utilities/IWYU/mapping.imp b/Utilities/IWYU/mapping.imp index cfa90cc..a732c9c 100644 --- a/Utilities/IWYU/mapping.imp +++ b/Utilities/IWYU/mapping.imp @@ -47,6 +47,12 @@ #{ symbol: [ "std::pair", private, "<map>", public ] }, #{ symbol: [ "std::pair", private, "<set>", public ] }, + # IWYU wrongly suggests to include "cm_auto_ptr.hxx" in some places. This + # might be a misinterpretation of a template specialization in <utility>. + # As a workaround, map the symbol auto_ptr to "cmConfigure.h". + # This will still correctly require "cm_auto_ptr.hxx" for CM_AUTO_PTR. + { symbol: [ "cm::auto_ptr", private, "\"cmConfigure.h\"", public ] }, + # Wrappers for headers added in TR1 / C++11 # { include: [ "<array>", public, "\"cm_array.hxx\"", public ] }, # { include: [ "<functional>", public, "\"cm_functional.hxx\"", public ] }, @@ -113,6 +119,11 @@ { include: [ "\"cmzlib/zconf.h\"", private, "\"cm_zlib.h\"", public ] }, { include: [ "\"cmzlib/zlib.h\"", private, "\"cm_zlib.h\"", public ] }, + # System symbols used by libuv + { symbol: [ "SIGHUP", private, "\"cm_uv.h\"", public ] }, + { symbol: [ "SIGINT", private, "\"cm_uv.h\"", public ] }, + { symbol: [ "ssize_t", private, "\"cm_uv.h\"", public ] }, + { symbol: [ "std::ifstream", private, "\"cmsys/FStream.hxx\"", public ] }, { symbol: [ "std::ofstream", private, "\"cmsys/FStream.hxx\"", public ] }, { symbol: [ "cmsys::ifstream", private, "\"cmsys/FStream.hxx\"", public ] }, |