111 lines
3.1 KiB
Diff
111 lines
3.1 KiB
Diff
From e7403438de998a56ccceefa3e25d7af0fdcbffc2 Mon Sep 17 00:00:00 2001
|
|
From: Davide Cavalca <dcavalca@fb.com>
|
|
Date: Thu, 18 Feb 2021 08:17:03 -0800
|
|
Subject: [PATCH] oomd: fix missing includes for gcc-11
|
|
|
|
Summary:
|
|
This in an import of a patch currently applied in the Fedora
|
|
packaging. This patch was authored by Jeff Law <law@redhat.com> in
|
|
https://src.fedoraproject.org/rpms/oomd/c/3844a403b26cedf9d1066d2feb95fd9b90f6bc34?branch=rawhide
|
|
|
|
Reviewed By: dschatzberg
|
|
|
|
Differential Revision: D26508041
|
|
|
|
fbshipit-source-id: a9e0db47370a84a9363f79e9bd0fd5236d40aed5
|
|
---
|
|
src/oomd/Stats.cpp | 1 +
|
|
src/oomd/StatsClient.cpp | 1 +
|
|
src/oomd/StatsTest.cpp | 1 +
|
|
src/oomd/config/JsonConfigParser.cpp | 1 +
|
|
src/oomd/include/CgroupPath.cpp | 1 +
|
|
src/oomd/util/Fs.cpp | 2 ++
|
|
src/oomd/util/FsTest.cpp | 1 +
|
|
7 files changed, 8 insertions(+)
|
|
|
|
diff --git a/src/oomd/Stats.cpp b/src/oomd/Stats.cpp
|
|
index cc66bc4..9c866ca 100644
|
|
--- a/src/oomd/Stats.cpp
|
|
+++ b/src/oomd/Stats.cpp
|
|
@@ -27,6 +27,7 @@
|
|
#include <chrono>
|
|
#include <cstring>
|
|
#include <iostream>
|
|
+#include <optional>
|
|
|
|
#include "oomd/Stats.h"
|
|
#include "oomd/StatsClient.h"
|
|
diff --git a/src/oomd/StatsClient.cpp b/src/oomd/StatsClient.cpp
|
|
index ce17ecf..f950e0d 100644
|
|
--- a/src/oomd/StatsClient.cpp
|
|
+++ b/src/oomd/StatsClient.cpp
|
|
@@ -23,6 +23,7 @@
|
|
#include <sys/un.h>
|
|
#include <unistd.h>
|
|
#include <iostream>
|
|
+#include <optional>
|
|
#include <vector>
|
|
#include "oomd/Stats.h"
|
|
#include "oomd/util/ScopeGuard.h"
|
|
diff --git a/src/oomd/StatsTest.cpp b/src/oomd/StatsTest.cpp
|
|
index db70983..a3ff931 100644
|
|
--- a/src/oomd/StatsTest.cpp
|
|
+++ b/src/oomd/StatsTest.cpp
|
|
@@ -22,6 +22,7 @@
|
|
#include <json/value.h>
|
|
#include <sys/socket.h>
|
|
#include <iostream>
|
|
+#include <optional>
|
|
#include "oomd/StatsClient.h"
|
|
|
|
#include "oomd/util/Util.h"
|
|
diff --git a/src/oomd/config/JsonConfigParser.cpp b/src/oomd/config/JsonConfigParser.cpp
|
|
index 50b1d40..c4ae13c 100644
|
|
--- a/src/oomd/config/JsonConfigParser.cpp
|
|
+++ b/src/oomd/config/JsonConfigParser.cpp
|
|
@@ -17,6 +17,7 @@
|
|
|
|
#include "oomd/config/JsonConfigParser.h"
|
|
|
|
+#include <optional>
|
|
#include <sstream>
|
|
|
|
#include <json/reader.h>
|
|
diff --git a/src/oomd/include/CgroupPath.cpp b/src/oomd/include/CgroupPath.cpp
|
|
index addbf74..665c1e7 100644
|
|
--- a/src/oomd/include/CgroupPath.cpp
|
|
+++ b/src/oomd/include/CgroupPath.cpp
|
|
@@ -18,6 +18,7 @@
|
|
#include "oomd/include/CgroupPath.h"
|
|
|
|
#include <exception>
|
|
+#include <optional>
|
|
|
|
#include "oomd/util/Fs.h"
|
|
#include "oomd/util/Util.h"
|
|
diff --git a/src/oomd/util/Fs.cpp b/src/oomd/util/Fs.cpp
|
|
index 4fc669f..3389cbd 100644
|
|
--- a/src/oomd/util/Fs.cpp
|
|
+++ b/src/oomd/util/Fs.cpp
|
|
@@ -15,6 +15,8 @@
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
*/
|
|
|
|
+#include <optional>
|
|
+
|
|
#include "oomd/util/Fs.h"
|
|
|
|
#include <dirent.h>
|
|
diff --git a/src/oomd/util/FsTest.cpp b/src/oomd/util/FsTest.cpp
|
|
index 362c7e5..4ce31ba 100644
|
|
--- a/src/oomd/util/FsTest.cpp
|
|
+++ b/src/oomd/util/FsTest.cpp
|
|
@@ -15,6 +15,7 @@
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
*/
|
|
|
|
+#include <optional>
|
|
#include <utility>
|
|
#include <vector>
|
|
|