From a2a5264aba0f80ad14edb14a155518d6ccce6a84 Mon Sep 17 00:00:00 2001
From: bheath-adobe <104525397+bheath-adobe@users.noreply.github.com>
Date: Fri, 22 Mar 2024 18:57:19 -0500
Subject: [PATCH] Add missing include to task.hpp (#111)

* Add missing include to task.hpp

Add missing <optional> include to task.hpp

* Fixes caught by updates in CI

* With -Wall VC++ warns about compiler ignoring or adding inlines.

* rm's have to go before boost install.

---------

Co-authored-by: Sean Parent <sparent@adobe.com>
---
 .github/workflows/adobe_source_libraries.yml | 12 +++++++++++-
 CMakeLists.txt                               |  4 ++--
 adobe/functional/operator.hpp                |  4 +++-
 adobe/task.hpp                               |  1 +
 4 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/adobe_source_libraries.yml b/.github/workflows/adobe_source_libraries.yml
index 154d5924..f608ff68 100644
--- a/.github/workflows/adobe_source_libraries.yml
+++ b/.github/workflows/adobe_source_libraries.yml
@@ -4,7 +4,7 @@ on:
   pull_request:
   push:
     branches:
-    - master
+      - main
 
 jobs:
   generate-matrix:
@@ -35,6 +35,16 @@ jobs:
       - name: Install dependencies (macos)
         if: ${{ startsWith(matrix.config.os, 'macos') }}
         run: |
+          rm '/usr/local/bin/2to3'
+          rm '/usr/local/bin/2to3-3.12'
+          rm '/usr/local/bin/idle3'
+          rm '/usr/local/bin/idle3.12'
+          rm '/usr/local/bin/pydoc3'
+          rm '/usr/local/bin/pydoc3.12'
+          rm '/usr/local/bin/python3'
+          rm '/usr/local/bin/python3.12'
+          rm '/usr/local/bin/python3-config'
+          rm '/usr/local/bin/python3.12-config'
           brew install boost
           brew install ninja
         shell: bash
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 63359bd4..0a7d1f4d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,8 +16,8 @@ set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++")
 set(VCPKG_FEATURE_FLAGS "versions")
 project(adobe-source-libraries CXX)
 
-add_definitions ("-Wall")
-#add_definitions ("-Werror")
+# add_definitions ("-Wall")
+# add_definitions ("-Werror")
 
 # There are two big choices this file makes - how to include Boost, and how to
 # include double-conversion, respectively. Build environments vary and we're
diff --git a/adobe/functional/operator.hpp b/adobe/functional/operator.hpp
index 66a7861b..8b524680 100644
--- a/adobe/functional/operator.hpp
+++ b/adobe/functional/operator.hpp
@@ -62,7 +62,9 @@ struct less {
         return x < y;
     }
 
-    bool operator()(const std::type_info& x, const std::type_info& y) { return x.before(y) != 0; }
+    bool operator()(const std::type_info& x, const std::type_info& y) const {
+        return x.before(y) != 0;
+    }
 };
 
 struct greater_equal {
diff --git a/adobe/task.hpp b/adobe/task.hpp
index 6e816c61..994f5c71 100644
--- a/adobe/task.hpp
+++ b/adobe/task.hpp
@@ -25,6 +25,7 @@
 #include <list>
 #include <memory>
 #include <mutex>
+#include <optional>
 
 #endif