Patch cereal (#19091)
Change-Id: I9fe2a1490c8c31a4174aca4ed2e270aa1efa1a50 Co-authored-by: Eric Müller <mueller@kip.uni-heidelberg.de>
This commit is contained in:
parent
796561ed82
commit
830b30b8d5
@ -0,0 +1,13 @@
|
||||
diff -pur cereal/include/cereal/details/static_object.hpp cereal_new/include/cereal/details/static_object.hpp
|
||||
--- cereal/include/cereal/details/static_object.hpp 2020-05-06 11:10:09.251770253 +0200
|
||||
+++ cereal_new/include/cereal/details/static_object.hpp 2020-05-06 11:11:00.904447455 +0200
|
||||
@@ -94,7 +94,8 @@ namespace cereal
|
||||
std::unique_lock<std::mutex> lock;
|
||||
#else
|
||||
public:
|
||||
- LockGuard(LockGuard const &) = default; // prevents implicit copy ctor warning
|
||||
+ LockGuard() = default;
|
||||
+ LockGuard(LockGuard const &) = default; // prevents implicit copy ctor warning
|
||||
~LockGuard() CEREAL_NOEXCEPT {} // prevents variable not used
|
||||
#endif
|
||||
};
|
@ -31,6 +31,8 @@ class Cereal(CMakePackage):
|
||||
patch("Boost.patch")
|
||||
patch("Boost2.patch", when="@1.2.2:")
|
||||
patch("pointers.patch")
|
||||
# fixed in HEAD but not released yet
|
||||
patch("LockGuard-default-ctor.patch", when="@:1.3.999")
|
||||
|
||||
depends_on('cmake@2.6.2:', type='build')
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user