commit 9229319dc8963a0157f970563de952911ea9c228
parent 7d8ebf259c39b1f1ed33631b195915652e39b7d9
Author: d.levin256@gmail.com <d.levin256@gmail.com>
Date: Thu, 28 Nov 2019 10:36:22 +0000
iOS C++17 fix
Diffstat:
3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -36,7 +36,7 @@ jobs:
set -e
sudo add-apt-repository ppa:ubuntu-toolchain-r/test
sudo apt-get update && sudo apt-get install -y ninja-build libmpfr-dev gcc-7 g++-7
- ci/run.sh build-release -DCPU_ARCH=detect -DENABLE_DFT=OFF -DCMAKE_CXX_COMPILER=g++-7 -DCMAKE_BUILD_TYPE=Release
+ ci/run.sh build-release -DCPU_ARCH=avx -DENABLE_DFT=OFF -DCMAKE_CXX_COMPILER=g++-7 -DCMAKE_BUILD_TYPE=Release
- job: Linux_x86_64_GCC8
timeoutInMinutes: 120
diff --git a/capi/CMakeLists.txt b/capi/CMakeLists.txt
@@ -93,7 +93,7 @@ else ()
if (APPLE)
message (STATUS "Minimum macOS version is set to ${CMAKE_OSX_DEPLOYMENT_TARGET}")
- message (STATUS "Adjust CMAKE_OSX_DEPLOYMENT_TARGET variable if needed")
+ message (STATUS "Set CMAKE_OSX_DEPLOYMENT_TARGET variable to change")
else ()
set_property(TARGET kfr_capi APPEND PROPERTY LINK_LIBRARIES -nodefaultlibs -Wl,-Bdynamic -lm -lc -Wl,-Bstatic -lstdc++ -lgcc -s)
endif ()
diff --git a/include/kfr/base/pointer.hpp b/include/kfr/base/pointer.hpp
@@ -125,6 +125,13 @@ struct expression_resource_impl : expression_resource
expression_resource_impl(E&& e) CMT_NOEXCEPT : e(std::move(e)) {}
virtual ~expression_resource_impl() {}
virtual void* instance() override final { return &e; }
+public:
+#ifdef __cpp_aligned_new
+ static void operator delete (void* p, std::align_val_t al) noexcept
+ {
+ internal_generic::aligned_release(p);
+ }
+#endif
private:
E e;