diff options
| author | Timothy Simpson <simpsont@objectcomputing.com> | 2022-10-03 18:47:03 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-03 18:47:03 -0500 |
| commit | 1bff842cc585cbad02f265371674f83016b174dd (patch) | |
| tree | 2d1639c419884ec23619574e1250b54594d9f26a | |
| parent | f7612da13ee5cc1fec02cf237d42fa9fc7ea1a5b (diff) | |
| parent | ca56b7ce419361e95e82eb37867e55efc5c04f3f (diff) | |
| download | ATCD-1bff842cc585cbad02f265371674f83016b174dd.tar.gz | |
Merge pull request #1947 from simpsont-oci/cpp17_lacks_auto_ptr
C++17 or greater implies lack of std::auto_ptr
| -rw-r--r-- | .github/workflows/macosx.yml | 4 | ||||
| -rw-r--r-- | ACE/ace/config-macosx-leopard.h | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/.github/workflows/macosx.yml b/.github/workflows/macosx.yml index d74e4f83420..850fb8cb26d 100644 --- a/.github/workflows/macosx.yml +++ b/.github/workflows/macosx.yml @@ -16,8 +16,8 @@ jobs: strategy: fail-fast: false matrix: - cxxstd: ["03", "11"] - os: [macos-10.15, macos-11.0] + cxxstd: ["03", "11", "17"] + os: [macos-11, macos-12] include: - platform_file: include $(ACE_ROOT)/include/makeinclude/platform_macosx.GNU runs-on: ${{ matrix.os }} diff --git a/ACE/ace/config-macosx-leopard.h b/ACE/ace/config-macosx-leopard.h index 23d9dea5ddd..f86314bda3a 100644 --- a/ACE/ace/config-macosx-leopard.h +++ b/ACE/ace/config-macosx-leopard.h @@ -211,6 +211,10 @@ #endif #endif +#if __cplusplus >= 201703L && !defined (_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR) +# define ACE_LACKS_AUTO_PTR +#endif + // dlcompat package (not part of base Darwin) is needed for dlopen(). // You may download directly from sourceforge and install or use fink // Fink installer puts libraries in /sw/lib and headers in /sw/include |