aboutsummaryrefslogtreecommitdiff
path: root/libphobos
diff options
context:
space:
mode:
Diffstat (limited to 'libphobos')
-rw-r--r--libphobos/libdruntime/MERGE2
-rw-r--r--libphobos/libdruntime/rt/minfo.d8
2 files changed, 5 insertions, 5 deletions
diff --git a/libphobos/libdruntime/MERGE b/libphobos/libdruntime/MERGE
index dec75f7..a142195 100644
--- a/libphobos/libdruntime/MERGE
+++ b/libphobos/libdruntime/MERGE
@@ -1,4 +1,4 @@
-aab44549221cb29434fe2feccaf1174af54dd79d
+cb1583b4b7313bb6d79a5102b6c91e71f5181b19
The first line of this file holds the git revision number of the last
merge done from the dlang/druntime repository.
diff --git a/libphobos/libdruntime/rt/minfo.d b/libphobos/libdruntime/rt/minfo.d
index 548bcc7..4722866 100644
--- a/libphobos/libdruntime/rt/minfo.d
+++ b/libphobos/libdruntime/rt/minfo.d
@@ -125,7 +125,7 @@ struct ModuleGroup
break;
distloop:
// search for next (previous) module in cycle.
- foreach (int m, d; distance)
+ foreach (m, d; distance)
{
if (d == curdist)
{
@@ -470,7 +470,7 @@ struct ModuleGroup
// pre-allocate enough space to hold all modules.
ctors = (cast(immutable(ModuleInfo)**).malloc(len * (void*).sizeof));
ctoridx = 0;
- foreach (int idx, m; _modules)
+ foreach (idx, m; _modules)
{
if (m.flags & relevantFlags)
{
@@ -582,8 +582,8 @@ struct ModuleGroup
}
// initialize the initial edges
- foreach (int i, ref v; initialEdges)
- v = i;
+ foreach (i, ref v; initialEdges)
+ v = cast(int)i;
bool sort(ref immutable(ModuleInfo)*[] ctors, uint mask)
{