Merge pull request #19 from fanquake/use_core_swap

refactor: use core/swap.hpp over boost/swap.hpp
2025-07-02 23:36:31 +02:00 · 2022-08-23 09:23:28 -07:00 · 2022-08-23 15:55:19 +01:00 · 2022-07-26 09:51:51 -07:00 · 2022-07-25 18:03:08 +08:00 · 2021-08-04 07:08:17 -07:00
2 changed files with 43 additions and 18 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@ -21,7 +21,8 @@ jobs:
            buildtype: "96ad197d74-2319b6d45f"
            packages: ""
            packages_to_remove: ""
-            os: "ubuntu-16.04"
+            os: "ubuntu-20.04"
+            container: "ubuntu:16.04"
            cxx: "g++"
            sources: ""
            llvm_os: ""
@ -31,7 +32,8 @@ jobs:
            buildtype: "boost"
            packages: ""
            packages_to_remove: ""
-            os: "ubuntu-16.04"
+            os: "ubuntu-20.04"
+            container: "ubuntu:16.04"
            cxx: "g++"
            sources: ""
            llvm_os: ""
@ -43,7 +45,8 @@ jobs:
            buildtype: "boost"
            packages: "g++-4.7"
            packages_to_remove: ""
-            os: "ubuntu-16.04"
+            os: "ubuntu-20.04"
+            container: "ubuntu:16.04"
            cxx: "g++-4.7"
            sources: ""
            llvm_os: ""
@ -55,7 +58,8 @@ jobs:
            buildtype: "boost"
            packages: "g++-4.8"
            packages_to_remove: ""
-            os: "ubuntu-16.04"
+            os: "ubuntu-20.04"
+            container: "ubuntu:16.04"
            cxx: "g++-4.8"
            sources: ""
            llvm_os: ""
@ -67,7 +71,8 @@ jobs:
            buildtype: "boost"
            packages: "g++-4.9"
            packages_to_remove: ""
-            os: "ubuntu-16.04"
+            os: "ubuntu-20.04"
+            container: "ubuntu:16.04"
            cxx: "g++-4.9"
            sources: ""
            llvm_os: ""
@ -79,7 +84,8 @@ jobs:
            buildtype: "boost"
            packages: "g++-5"
            packages_to_remove: ""
-            os: "ubuntu-16.04"
+            os: "ubuntu-20.04"
+            container: "ubuntu:16.04"
            cxx: "g++-5"
            sources: ""
            llvm_os: ""
@ -91,7 +97,8 @@ jobs:
            buildtype: "boost"
            packages: "g++-6"
            packages_to_remove: ""
-            os: "ubuntu-16.04"
+            os: "ubuntu-20.04"
+            container: "ubuntu:16.04"
            cxx: "g++-6"
            sources: ""
            llvm_os: ""
@ -103,7 +110,8 @@ jobs:
            buildtype: "boost"
            packages: "g++-7"
            packages_to_remove: ""
-            os: "ubuntu-16.04"
+            os: "ubuntu-20.04"
+            container: "ubuntu:16.04"
            cxx: "g++-7"
            sources: ""
            llvm_os: ""
@ -115,7 +123,7 @@ jobs:
            buildtype: "boost"
            packages: ""
            packages_to_remove: ""
-            os: "ubuntu-16.04"
+            os: "ubuntu-18.04"
            cxx: "clang++"
            sources: ""
            llvm_os: ""
@ -127,7 +135,8 @@ jobs:
            buildtype: "boost"
            packages: "clang-3.5 libstdc++-4.9-dev"
            packages_to_remove: ""
-            os: "ubuntu-16.04"
+            os: "ubuntu-20.04"
+            container: "ubuntu:16.04"
            cxx: "clang++-3.5"
            sources: ""
            llvm_os: "precise"
@ -139,7 +148,8 @@ jobs:
            buildtype: "boost"
            packages: "clang-3.6"
            packages_to_remove: ""
-            os: "ubuntu-16.04"
+            os: "ubuntu-20.04"
+            container: "ubuntu:16.04"
            cxx: "clang++-3.6"
            sources: ""
            llvm_os: "precise"
@ -151,7 +161,8 @@ jobs:
            buildtype: "boost"
            packages: "clang-3.7"
            packages_to_remove: ""
-            os: "ubuntu-16.04"
+            os: "ubuntu-20.04"
+            container: "ubuntu:16.04"
            cxx: "clang++-3.7"
            sources: ""
            llvm_os: "precise"
@ -163,7 +174,8 @@ jobs:
            buildtype: "boost"
            packages: "clang-3.8 libstdc++-4.9-dev"
            packages_to_remove: ""
-            os: "ubuntu-16.04"
+            os: "ubuntu-20.04"
+            container: "ubuntu:16.04"
            cxx: "clang++-3.8"
            sources: ""
            llvm_os: "precise"
@ -175,7 +187,8 @@ jobs:
            buildtype: "boost"
            packages: "clang-3.9 libstdc++-4.9-dev"
            packages_to_remove: ""
-            os: "ubuntu-16.04"
+            os: "ubuntu-20.04"
+            container: "ubuntu:16.04"
            cxx: "clang++-3.9"
            sources: ""
            llvm_os: "precise"
@ -187,7 +200,8 @@ jobs:
            buildtype: "boost"
            packages: "clang-4.0"
            packages_to_remove: ""
-            os: "ubuntu-16.04"
+            os: "ubuntu-20.04"
+            container: "ubuntu:16.04"
            cxx: "clang++-4.0"
            sources: ""
            llvm_os: "xenial"
@ -199,7 +213,8 @@ jobs:
            buildtype: "boost"
            packages: "clang-5.0"
            packages_to_remove: ""
-            os: "ubuntu-16.04"
+            os: "ubuntu-20.04"
+            container: "ubuntu:16.04"
            cxx: "clang++-5.0"
            sources: ""
            llvm_os: "xenial"
@ -215,6 +230,16 @@ jobs:
      - name: Check if running in container
        if: matrix.container != ''
        run: echo "GHA_CONTAINER=${{ matrix.container }}" >> $GITHUB_ENV
+      - name: If running in container, upgrade packages
+        if: matrix.container != ''
+        run: |
+            apt-get -o Acquire::Retries=3 update && DEBIAN_FRONTEND=noninteractive apt-get -y install tzdata && apt-get -o Acquire::Retries=3 install -y sudo software-properties-common wget curl apt-transport-https make apt-file sudo unzip libssl-dev build-essential autotools-dev autoconf automake g++ libc++-helpers python ruby cpio gcc-multilib g++-multilib pkgconf python3 ccache libpython-dev
+            sudo apt-add-repository ppa:git-core/ppa
+            sudo apt-get -o Acquire::Retries=3 update && apt-get -o Acquire::Retries=3 -y install git
+            python_version=$(python3 -c 'import sys; print("{0.major}.{0.minor}".format(sys.version_info))')
+            sudo wget https://bootstrap.pypa.io/pip/$python_version/get-pip.py
+            sudo python3 get-pip.py
+            sudo /usr/local/bin/pip install cmake

      - uses: actions/checkout@v2

@ -320,7 +345,7 @@ jobs:
          - name: "TOOLSET=clang COMPILER=clang++ CXXSTD=03,11,1 Job 16"
            buildtype: "boost"
            packages: ""
-            os: "macos-10.15"
+            os: "macos-11"
            cxx: "clang++"
            sources: ""
            llvm_os: ""
--- a/include/boost/array.hpp
+++ b/include/boost/array.hpp
@ -44,8 +44,8 @@
 #include <iterator>
 #include <stdexcept>
 #include <boost/assert.hpp>
+#include <boost/core/swap.hpp>
 #include <boost/static_assert.hpp>
-#include <boost/swap.hpp>

 #include <boost/throw_exception.hpp>
 #include <algorithm>
Author	SHA1	Message	Date
Marshall Clow	868af27d82	Merge pull request #19 from fanquake/use_core_swap refactor: use core/swap.hpp over boost/swap.hpp	2022-08-23 09:23:28 -07:00
fanquake	4647fc7095	refactor: use core/swap.hpp over boost/swap.hpp The later is deprecated: ```cpp ifndef BOOST_SWAP_HPP define BOOST_SWAP_HPP // The header file at this path is deprecated; // use boost/core/swap.hpp instead. include <boost/core/swap.hpp> endif ```	2022-08-23 15:55:19 +01:00
Marshall Clow	9cc63ae0dd	Merge pull request #18 from renbaoshuo/patch-1 chore: bump macos runner version	2022-07-26 09:51:51 -07:00
Baoshuo Ren	a3f15458b8	chore: bump macos runner version GitHub Action is sunsetting the macOS 10.15 Actions runner. It will stop working intermittently until being completely removed by 2022-8-30: https://github.blog/changelog/2022-07-20-github-actions-the-macos-10-15-actions-runner-image-is-being-deprecated-and-will-be-removed-by-8-30-22	2022-07-25 18:03:08 +08:00
Marshall Clow	a9a3dbbc41	Merge pull request #16 from sdarwin/feature/gha_fix_1 Update GitHub Actions CI file	2021-08-04 07:08:17 -07:00
sdarwin	e384e3780b	Update GitHub Actions CI file	2021-07-30 16:10:15 +00:00