Merge pull request #3853 from 9rnsr/fix12359

Fix for issue 12359
dlang · Jan 6, 2016 · 8e38e62 · 8e38e62
2 parents 124bc71 + d7fdf69
commit 8e38e62
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/std/file.d b/std/file.d
@@ -3093,7 +3093,7 @@ void copy(RF, RT)(auto ref RF from, auto ref RT to, PreserveAttributes preserve
 
 unittest // issue 15319
 {
-    import std.path: dirEntries;
+    import std.file : dirEntries;
     auto fs = dirEntries(getcwd, SpanMode.depth);
     assert(__traits(compiles, copy(fs.front, fs.front)));
 }

diff --git a/std/net/curl.d b/std/net/curl.d
@@ -3886,12 +3886,12 @@ private struct CurlAPI
             enforce!CurlException(handle !is null, "Failed to load curl, tried %(%s, %).".format(names));
         }
 
-        foreach (mem; __traits(allMembers, API))
+        foreach (i, FP; typeof(API.tupleof))
         {
-            void* p = loadSym(handle, "curl_"~mem);
-
-            __traits(getMember, _api, mem) = cast(typeof(__traits(getMember, _api, mem)))
-                enforce!CurlException(p, "Couldn't load curl_"~mem~" from libcurl.");
+            enum name = __traits(identifier, _api.tupleof[i]);
+            auto p = enforce!CurlException(loadSym(handle, "curl_"~name),
+                                           "Couldn't load curl_"~name~" from libcurl.");
+            _api.tupleof[i] = cast(FP) p;
         }
 
         enforce!CurlException(!_api.global_init(CurlGlobal.all),