Skip to content

Commit

Permalink
Add missing include to task.hpp (#111)
Browse files Browse the repository at this point in the history
* 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>
  • Loading branch information
bheath-adobe and sean-parent authored Mar 22, 2024
1 parent 36867df commit a2a5264
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 4 deletions.
12 changes: 11 additions & 1 deletion .github/workflows/adobe_source_libraries.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
pull_request:
push:
branches:
- master
- main

jobs:
generate-matrix:
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion adobe/functional/operator.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions adobe/task.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#include <list>
#include <memory>
#include <mutex>
#include <optional>

#endif

Expand Down

0 comments on commit a2a5264

Please sign in to comment.