From: Luca Heltai Date: Mon, 25 Jan 2021 11:39:28 +0000 (+0100) Subject: Try to fix docker images. X-Git-Tag: v9.3.0-rc1~573^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7619a166dc726e9b4143f9ff370e123477b54413;p=dealii.git Try to fix docker images. --- diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 2b493df895..1ef1706de7 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -12,7 +12,7 @@ jobs: uses: actions/checkout@v2 - name: Build and push Docker image of master - uses: docker/build-push-action@v1 + uses: docker/build-push-action@v2 with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} diff --git a/contrib/python-bindings/include/reference_cell_wrapper.h b/contrib/python-bindings/include/reference_cell_wrapper.h index 1a8b755f58..4ff8cb3e6a 100644 --- a/contrib/python-bindings/include/reference_cell_wrapper.h +++ b/contrib/python-bindings/include/reference_cell_wrapper.h @@ -35,12 +35,12 @@ namespace python CellTypeWrapper(const CellTypeWrapper &other); /** - * Constructor. Takes a CellKinds enum field and creates a Type class. + * Constructor. Takes a cell kind id field and creates a Type class. */ - CellTypeWrapper(const ReferenceCell::Type::CellKinds &kind); + CellTypeWrapper(const std::uint8_t &kind); /** - * Constructor. Takes a CellKinds enum field and creates a Type class. + * Constructor. Takes a ReferenceCell::Type object and creates a Type class. */ CellTypeWrapper(const ReferenceCell::Type &cell_type_in); @@ -54,7 +54,7 @@ namespace python */ ~CellTypeWrapper(); - ReferenceCell::Type::CellKinds + std::uint8_t cell_kind() const; private: diff --git a/contrib/python-bindings/source/reference_cell_wrapper.cc b/contrib/python-bindings/source/reference_cell_wrapper.cc index b87e29ddc5..a1f9ffafac 100644 --- a/contrib/python-bindings/source/reference_cell_wrapper.cc +++ b/contrib/python-bindings/source/reference_cell_wrapper.cc @@ -33,7 +33,7 @@ namespace python - CellTypeWrapper::CellTypeWrapper(const ReferenceCell::Type::CellKinds &kind) + CellTypeWrapper::CellTypeWrapper(const std::uint8_t &kind) { cell_type = kind; } @@ -52,11 +52,10 @@ namespace python - ReferenceCell::Type::CellKinds + std::uint8_t CellTypeWrapper::cell_kind() const { - std::uint8_t kind = (std::uint8_t)cell_type; - return static_cast(kind); + return cell_type; } } // namespace python