Commit 4e95f7b8 by Maarten L. Hekkelman

restored find atomic

parent f85b6d94
...@@ -32,6 +32,7 @@ project( ...@@ -32,6 +32,7 @@ project(
list(PREPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") list(PREPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
include(FindAtomic)
include(CheckFunctionExists) include(CheckFunctionExists)
include(CheckIncludeFiles) include(CheckIncludeFiles)
include(CheckLibraryExists) include(CheckLibraryExists)
...@@ -366,7 +367,7 @@ target_include_directories( ...@@ -366,7 +367,7 @@ target_include_directories(
"$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>" "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
PRIVATE "${BOOST_REGEX_INCLUDE_DIR}" "${EIGEN_INCLUDE_DIR}") PRIVATE "${BOOST_REGEX_INCLUDE_DIR}" "${EIGEN_INCLUDE_DIR}")
target_link_libraries(cifpp PUBLIC Threads::Threads ZLIB::ZLIB) target_link_libraries(cifpp PUBLIC Threads::Threads ZLIB::ZLIB std::atomic)
if(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang") if(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
target_link_options(cifpp PRIVATE -undefined dynamic_lookup) target_link_options(cifpp PRIVATE -undefined dynamic_lookup)
......
...@@ -1292,9 +1292,9 @@ template <typename T> ...@@ -1292,9 +1292,9 @@ template <typename T>
condition operator!=(const key &key, const std::optional<T> &v) condition operator!=(const key &key, const std::optional<T> &v)
{ {
if (v.has_value()) if (v.has_value())
return condition(new detail::not_condition_impl(condition{new detail::key_equals_condition_impl({ key.m_item_name, *v })})); return condition(new detail::not_condition_impl(condition(new detail::key_equals_condition_impl({ key.m_item_name, *v }))));
else else
return condition(new detail::not_condition_impl(condition{new detail::key_is_empty_condition_impl(key.m_item_name)})); return condition(new detail::not_condition_impl(condition(new detail::key_is_empty_condition_impl(key.m_item_name))));
} }
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment