hardcoresushi
/
libcryfs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Use boost::promise because std::promise doesn't compile on windows with non-default-constructible types

This commit is contained in:
Sebastian Messmer 2018-05-21 00:27:50 -07:00
parent bacc95f2f2
commit 9ef3e5ce63
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/parallelaccessstore/CMakeLists.txt
View File

@ -9,6 +9,6 @@ add_library(${PROJECT_NAME} STATIC ${SOURCES})
target_link_libraries(${PROJECT_NAME} PUBLIC cpp-utils)
target_add_boost(${PROJECT_NAME})
target_add_boost(${PROJECT_NAME} thread)
target_enable_style_warnings(${PROJECT_NAME})
target_activate_cpp14(${PROJECT_NAME})

12
src/parallelaccessstore/ParallelAccessStore.h
View File

@ -6,7 +6,7 @@
#include <memory>
#include <map>
#include <unordered_map>
#include <future>
#include <boost/thread/future.hpp>
#include <cassert>
#include <type_traits>
#include <cpp-utils/macros.h>
@ -92,13 +92,13 @@ private:
cpputils::unique_ref<ParallelAccessBaseStore<Resource, Key>> _baseStore;
std::unordered_map<Key, OpenResource> _openResources;
std::map<Key, std::promise<cpputils::unique_ref<Resource>>> _resourcesToRemove;
std::map<Key, boost::promise<cpputils::unique_ref<Resource>>> _resourcesToRemove;
template<class ActualResourceRef>
cpputils::unique_ref<ActualResourceRef> _add(const Key &key, cpputils::unique_ref<Resource> resource, std::function<cpputils::unique_ref<ActualResourceRef>(Resource*)> createResourceRef);
std::future<cpputils::unique_ref<Resource>> _resourceToRemoveFuture(const Key &key);
cpputils::unique_ref<Resource> _waitForResourceToRemove(const Key &key, std::future<cpputils::unique_ref<Resource>> resourceToRemoveFuture);
boost::future<cpputils::unique_ref<Resource>> _resourceToRemoveFuture(const Key &key);
cpputils::unique_ref<Resource> _waitForResourceToRemove(const Key &key, boost::future<cpputils::unique_ref<Resource>> resourceToRemoveFuture);
void release(const Key &key);
friend class CachedResource;
@ -208,9 +208,9 @@ void ParallelAccessStore<Resource, ResourceRef, Key>::remove(const Key &key, cpp
}
template<class Resource, class ResourceRef, class Key>
std::future<cpputils::unique_ref<Resource>> ParallelAccessStore<Resource, ResourceRef, Key>::_resourceToRemoveFuture(const Key &key) {
boost::future<cpputils::unique_ref<Resource>> ParallelAccessStore<Resource, ResourceRef, Key>::_resourceToRemoveFuture(const Key &key) {
std::lock_guard <std::mutex> lock(_mutex); // TODO Lock needed for _resourcesToRemove?
auto insertResult = _resourcesToRemove.emplace(key, std::promise<cpputils::unique_ref<Resource>>());
auto insertResult = _resourcesToRemove.emplace(key, boost::promise<cpputils::unique_ref<Resource>>());
ASSERT(true == insertResult.second, "Inserting failed");
return insertResult.first->second.get_future();
};