prepare for fix of druntime issue 16230

dlang · Aug 1, 2017 · 7e87d06 · 7e87d06
1 parent c09200b
commit 7e87d06
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/std/concurrency.d b/std/concurrency.d
@@ -2397,12 +2397,12 @@ version (unittest)
 private @property Mutex initOnceLock()
 {
     __gshared Mutex lock;
-    if (auto mtx = atomicLoad!(MemoryOrder.acq)(*cast(shared)&lock))
+    if (auto mtx = cast() atomicLoad!(MemoryOrder.acq)(*cast(shared)&lock))
         return mtx;
     auto mtx = new Mutex;
     if (cas(cast(shared)&lock, cast(shared) null, cast(shared) mtx))
         return mtx;
-    return atomicLoad!(MemoryOrder.acq)(*cast(shared)&lock);
+    return cast() atomicLoad!(MemoryOrder.acq)(*cast(shared)&lock);
 }
 
 /**

diff --git a/std/experimental/logger/core.d b/std/experimental/logger/core.d
@@ -1665,7 +1665,8 @@ if (sharedLog !is myLogger)
     static auto trustedLoad(ref shared Logger logger) @trusted
     {
         import core.atomic : atomicLoad, MemoryOrder;
-        return atomicLoad!(MemoryOrder.acq)(logger);
+        return cast() atomicLoad!(MemoryOrder.acq)(logger);
+            //FIXME: Casting shared away here. Not good. See issue 16232.
     }
 
     // If we have set up our own logger use that