Module: check_mk
Branch: master
Commit: ca0808fbb492a7856a84663feee02fdf9aa8bc1c
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ca0808fbb492a7…
Author: Sven Panne <sp(a)mathias-kettner.de>
Date: Wed May 17 12:30:52 2017 +0200
Sanitized IWYU's no_include pragmas a bit.
Change-Id: I5dd5fdd5a41e69e47e0599afc8ab586490f76a38
---
bin/mkevent.cc | 1 -
bin/mkeventd_open514.cc | 1 -
livestatus/src/Logfile.cc | 1 +
livestatus/src/LogwatchListColumn.cc | 2 --
livestatus/src/Query.h | 1 -
livestatus/src/ServiceListFilter.cc | 1 -
livestatus/src/StringUtils.cc | 1 +
livestatus/src/Table.h | 1 -
livestatus/src/TableColumns.cc | 1 -
livestatus/src/TableEventConsole.cc | 1 -
livestatus/src/TableEventConsoleEvents.cc | 2 --
livestatus/src/TableEventConsoleHistory.cc | 2 --
livestatus/src/TableLog.h | 1 -
livestatus/src/TableStateHistory.h | 1 -
livestatus/src/module.cc | 1 +
livestatus/src/pnp4nagios.cc | 2 --
tests/check_mk.imp | 8 +++++++-
17 files changed, 10 insertions(+), 18 deletions(-)
diff --git a/bin/mkevent.cc b/bin/mkevent.cc
index 1d09a62..2b55429 100644
--- a/bin/mkevent.cc
+++ b/bin/mkevent.cc
@@ -22,7 +22,6 @@
// to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
// Boston, MA 02110-1301 USA.
-// IWYU pragma: no_include <bits/socket_type.h>
#include <arpa/inet.h>
#include <fcntl.h>
#include <netinet/in.h>
diff --git a/bin/mkeventd_open514.cc b/bin/mkeventd_open514.cc
index 8d00bf0..c2b4f1d 100644
--- a/bin/mkeventd_open514.cc
+++ b/bin/mkeventd_open514.cc
@@ -30,7 +30,6 @@
That can then simply use filedescriptor 3 and receive syslog
messages */
-// IWYU pragma: no_include <bits/socket_type.h>
#include <netinet/in.h>
#include <sys/socket.h>
#include <unistd.h>
diff --git a/livestatus/src/Logfile.cc b/livestatus/src/Logfile.cc
index eb7d908..42ada94 100644
--- a/livestatus/src/Logfile.cc
+++ b/livestatus/src/Logfile.cc
@@ -22,6 +22,7 @@
// to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
// Boston, MA 02110-1301 USA.
+//
https://github.com/include-what-you-use/include-what-you-use/issues/166
// IWYU pragma: no_include <ext/alloc_traits.h>
#include "Logfile.h"
#include <fcntl.h>
diff --git a/livestatus/src/LogwatchListColumn.cc b/livestatus/src/LogwatchListColumn.cc
index 362b330..9631039 100644
--- a/livestatus/src/LogwatchListColumn.cc
+++ b/livestatus/src/LogwatchListColumn.cc
@@ -22,8 +22,6 @@
// to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
// Boston, MA 02110-1301 USA.
-// IWYU pragma: no_include <experimental/bits/fs_ops.h>
-// IWYU pragma: no_include <experimental/fs_ops.h>
#include "LogwatchListColumn.h"
#include <ostream>
#include "FileSystem.h"
diff --git a/livestatus/src/Query.h b/livestatus/src/Query.h
index 7bba21d..45719dd 100644
--- a/livestatus/src/Query.h
+++ b/livestatus/src/Query.h
@@ -25,7 +25,6 @@
#ifndef Query_h
#define Query_h
-// IWYU pragma: no_include <bits/shared_ptr.h>
#include "config.h" // IWYU pragma: keep
#include <cstdint>
#include <ctime>
diff --git a/livestatus/src/ServiceListFilter.cc b/livestatus/src/ServiceListFilter.cc
index 37a7750..03ebcbd 100644
--- a/livestatus/src/ServiceListFilter.cc
+++ b/livestatus/src/ServiceListFilter.cc
@@ -22,7 +22,6 @@
// to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
// Boston, MA 02110-1301 USA.
-// IWYU pragma: no_include <ext/alloc_traits.h>
#include "ServiceListFilter.h"
#include <ostream>
#include "Logger.h"
diff --git a/livestatus/src/StringUtils.cc b/livestatus/src/StringUtils.cc
index 89e1319..bd4d86a 100644
--- a/livestatus/src/StringUtils.cc
+++ b/livestatus/src/StringUtils.cc
@@ -22,6 +22,7 @@
// to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
// Boston, MA 02110-1301 USA.
+//
https://github.com/include-what-you-use/include-what-you-use/issues/434
// IWYU pragma: no_include <type_traits>
#include "StringUtils.h"
#include <algorithm>
diff --git a/livestatus/src/Table.h b/livestatus/src/Table.h
index 5356dc1..56529fa 100644
--- a/livestatus/src/Table.h
+++ b/livestatus/src/Table.h
@@ -25,7 +25,6 @@
#ifndef Table_h
#define Table_h
-// IWYU pragma: no_include <bits/shared_ptr.h>
#include "config.h" // IWYU pragma: keep
#include <map>
#include <memory>
diff --git a/livestatus/src/TableColumns.cc b/livestatus/src/TableColumns.cc
index aaae7ac..49fc726 100644
--- a/livestatus/src/TableColumns.cc
+++ b/livestatus/src/TableColumns.cc
@@ -22,7 +22,6 @@
// to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
// Boston, MA 02110-1301 USA.
-// IWYU pragma: no_include <bits/shared_ptr.h>
#include "TableColumns.h"
#include <memory>
#include "Column.h"
diff --git a/livestatus/src/TableEventConsole.cc b/livestatus/src/TableEventConsole.cc
index 6fd0747..6b495a8 100644
--- a/livestatus/src/TableEventConsole.cc
+++ b/livestatus/src/TableEventConsole.cc
@@ -22,7 +22,6 @@
// to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
// Boston, MA 02110-1301 USA.
-// IWYU pragma: no_include <bits/shared_ptr.h>
#include "TableEventConsole.h"
#include <iosfwd>
#include <iostream>
diff --git a/livestatus/src/TableEventConsoleEvents.cc
b/livestatus/src/TableEventConsoleEvents.cc
index 19aebf4..f9911a8 100644
--- a/livestatus/src/TableEventConsoleEvents.cc
+++ b/livestatus/src/TableEventConsoleEvents.cc
@@ -22,8 +22,6 @@
// to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
// Boston, MA 02110-1301 USA.
-// IWYU pragma: no_include <bits/shared_ptr.h>
-// IWYU pragma: no_include <algorithm>
#include "TableEventConsoleEvents.h"
#include <memory>
#include "Column.h"
diff --git a/livestatus/src/TableEventConsoleHistory.cc
b/livestatus/src/TableEventConsoleHistory.cc
index 14aa950..33b7f82 100644
--- a/livestatus/src/TableEventConsoleHistory.cc
+++ b/livestatus/src/TableEventConsoleHistory.cc
@@ -22,8 +22,6 @@
// to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
// Boston, MA 02110-1301 USA.
-// IWYU pragma: no_include <bits/shared_ptr.h>
-// IWYU pragma: no_include <algorithm>
#include "TableEventConsoleHistory.h"
#include <memory>
#include "Column.h"
diff --git a/livestatus/src/TableLog.h b/livestatus/src/TableLog.h
index 659c343..bee41ba 100644
--- a/livestatus/src/TableLog.h
+++ b/livestatus/src/TableLog.h
@@ -25,7 +25,6 @@
#ifndef TableLog_h
#define TableLog_h
-// IWYU pragma: no_include <bits/shared_ptr.h>
#include "config.h" // IWYU pragma: keep
#include <ctime>
#include <memory> // IWYU pragma: keep
diff --git a/livestatus/src/TableStateHistory.h b/livestatus/src/TableStateHistory.h
index 61548e8..77ab097 100644
--- a/livestatus/src/TableStateHistory.h
+++ b/livestatus/src/TableStateHistory.h
@@ -25,7 +25,6 @@
#ifndef TableStateHistory_h
#define TableStateHistory_h
-// IWYU pragma: no_include <bits/shared_ptr.h>
#include "config.h" // IWYU pragma: keep
#include <map>
#include <memory> // IWYU pragma: keep
diff --git a/livestatus/src/module.cc b/livestatus/src/module.cc
index 90d1fcb..2e1f030 100644
--- a/livestatus/src/module.cc
+++ b/livestatus/src/module.cc
@@ -25,6 +25,7 @@
// Needed for strdup and S_ISSOCK
#define _XOPEN_SOURCE 500
+//
https://github.com/include-what-you-use/include-what-you-use/issues/166
// IWYU pragma: no_include <ext/alloc_traits.h>
#include "config.h"
#include <fcntl.h>
diff --git a/livestatus/src/pnp4nagios.cc b/livestatus/src/pnp4nagios.cc
index e7a08b4..af39f7d 100644
--- a/livestatus/src/pnp4nagios.cc
+++ b/livestatus/src/pnp4nagios.cc
@@ -22,8 +22,6 @@
// to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
// Boston, MA 02110-1301 USA.
-// IWYU pragma: no_include <experimental/bits/fs_ops.h>
-// IWYU pragma: no_include <experimental/fs_ops.h>
#include "pnp4nagios.h"
#include <cstddef>
#include <system_error>
diff --git a/tests/check_mk.imp b/tests/check_mk.imp
index 7b574ba..15db6ca 100644
--- a/tests/check_mk.imp
+++ b/tests/check_mk.imp
@@ -1,5 +1,11 @@
# Default include mappings for Check_MK
[
{ ref: boost-all.imp },
- { ref: boost-all-private.imp }
+ { ref: boost-all-private.imp },
+ { include: ["<bits/shared_ptr.h>", private, "<memory>",
public ] },
+ { include: ["<bits/socket_type.h>", private,
"<sys/socket.h>", public ] },
+ { include: ["<experimental/bits/fs_ops.h>", private,
"<experimental/filesystem>", public ] },
+ { include: ["<experimental/fs_ops.h>", private,
"<experimental/filesystem>", public ] },
+ { include: ["<pcap/bpf.h>", private, "<pcap.h>", public
] },
+ { include: ["<pcap/pcap.h>", private, "<pcap.h>",
public ] }
]