Attachment 186136 Details for Bug 221890 – 0010-graphics-appleseed-Correct-spinlock-initialisation-w.patch

[patch] 0010-graphics-appleseed-Correct-spinlock-initialisation-w.patch

0010-graphics-appleseed-Correct-spinlock-initialisation-w.patch (text/plain), 1.34 KB, created by Roger Leigh on 2017-09-06 21:48:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Roger Leigh

Created: 2017-09-06 21:48:34 UTC

Size: 1.34 KB

patch

obsolete

>From 5a4cdbf99147af68c070623851ee40b611c7392b Mon Sep 17 00:00:00 2001
>From: Roger Leigh <rleigh@codelibre.net>
>Date: Wed, 6 Sep 2017 18:29:57 +0100
>Subject: [PATCH 10/13] graphics/appleseed: Correct spinlock initialisation
> with C++11
>
>This matches the way it's initialised internally by Boost.
>---
> .../files/patch-src_appleseed_foundation_platform_thread.h  | 13 +++++++++++++
> 1 file changed, 13 insertions(+)
> create mode 100644 graphics/appleseed/files/patch-src_appleseed_foundation_platform_thread.h
>
>diff --git a/graphics/appleseed/files/patch-src_appleseed_foundation_platform_thread.h b/graphics/appleseed/files/patch-src_appleseed_foundation_platform_thread.h
>new file mode 100644
>index 000000000000..0b2fb8da0e17
>--- /dev/null
>+++ b/graphics/appleseed/files/patch-src_appleseed_foundation_platform_thread.h
>@@ -0,0 +1,13 @@
>+--- src/appleseed/foundation/platform/thread.h.orig	2017-09-06 14:32:41 UTC
>++++ src/appleseed/foundation/platform/thread.h
>+@@ -296,9 +296,8 @@ class APPLESEED_DLLSYMBOL ThreadFlag
>+ 
>+ inline Spinlock::Spinlock()
>+ {
>+-    // todo: is there a simpler way to initialize m_sp in a platform-independent manner?
>+     boost::detail::spinlock initialized_sp = BOOST_DETAIL_SPINLOCK_INIT;
>+-    m_sp = initialized_sp;
>++    std::memcpy(&m_sp, &initialized_sp, sizeof(initialized_sp));
>+ }
>+ 
>+ inline bool Spinlock::try_lock()
>-- 
>2.14.1
>

Actions: View | Diff

Attachments on bug 221890: 185962 | 186127 | 186128 | 186129 | 186130 | 186131 | 186132 | 186133 | 186134 | 186135 | 186136 | 186153