From 89a369416144b5deb7339f5caa16fb4fc22eecb0 Mon Sep 17 00:00:00 2001
From: Robert Maynard <rmaynard@nvidia.com>
Date: Thu, 13 Jan 2022 15:46:37 -0500
Subject: [PATCH 1/2] Include <optional> in headers that use std::optional

Detected when compiling with gcc-11 where <optional> wasn't
being brought in by other standard headers
---
 cpp/include/cudf/strings/repeat_strings.hpp | 2 ++
 cpp/include/cudf/strings/replace_re.hpp     | 2 ++
 cpp/src/io/utilities/trie.cuh               | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/cpp/include/cudf/strings/repeat_strings.hpp b/cpp/include/cudf/strings/repeat_strings.hpp
index edba01b174f..f6bf12af967 100644
--- a/cpp/include/cudf/strings/repeat_strings.hpp
+++ b/cpp/include/cudf/strings/repeat_strings.hpp
@@ -18,6 +18,8 @@
 #include <cudf/scalar/scalar.hpp>
 #include <cudf/strings/strings_column_view.hpp>
 
+#include <optional>
+
 namespace cudf {
 namespace strings {
 /**
diff --git a/cpp/include/cudf/strings/replace_re.hpp b/cpp/include/cudf/strings/replace_re.hpp
index a2c4eba1636..0e904958d15 100644
--- a/cpp/include/cudf/strings/replace_re.hpp
+++ b/cpp/include/cudf/strings/replace_re.hpp
@@ -20,6 +20,8 @@
 #include <cudf/strings/regex/flags.hpp>
 #include <cudf/strings/strings_column_view.hpp>
 
+#include <optional>
+
 namespace cudf {
 namespace strings {
 /**
diff --git a/cpp/src/io/utilities/trie.cuh b/cpp/src/io/utilities/trie.cuh
index 1140a08b76b..85834ad2f0e 100644
--- a/cpp/src/io/utilities/trie.cuh
+++ b/cpp/src/io/utilities/trie.cuh
@@ -23,6 +23,8 @@
 
 #include <cudf/utilities/span.hpp>
 
+#include <optional>
+
 namespace cudf {
 namespace detail {
 static constexpr char trie_terminating_character = '\n';

From 770cb0c54c4f3395bc0d1bbdfaf0aae7ef2b912e Mon Sep 17 00:00:00 2001
From: Robert Maynard <rmaynard@nvidia.com>
Date: Tue, 18 Jan 2022 14:43:42 -0500
Subject: [PATCH 2/2] include optional header where std::optional is used

---
 cpp/benchmarks/common/generate_benchmark_input.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cpp/benchmarks/common/generate_benchmark_input.cpp b/cpp/benchmarks/common/generate_benchmark_input.cpp
index 995cea13c27..dcd8e32fc9d 100644
--- a/cpp/benchmarks/common/generate_benchmark_input.cpp
+++ b/cpp/benchmarks/common/generate_benchmark_input.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2021, NVIDIA CORPORATION.
+ * Copyright (c) 2020-2022, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,6 +31,7 @@
 
 #include <future>
 #include <memory>
+#include <optional>
 #include <random>
 #include <thread>
 #include <vector>