mirror of
https://github.com/ldc-developers/ldc.git
synced 2025-05-05 09:31:03 +03:00
Merge branch 'master' into merge-2.095
Conflicts: runtime/phobos
This commit is contained in:
commit
3eab44153a
2 changed files with 1 additions and 20 deletions
|
@ -1382,22 +1382,3 @@ DValue *DtoArgument(Parameter *fnarg, Expression *argexp) {
|
||||||
|
|
||||||
return arg;
|
return arg;
|
||||||
}
|
}
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////////
|
|
||||||
|
|
||||||
int binary(const char *p, const char **tab, int high) {
|
|
||||||
int i = 0, j = high, k, l;
|
|
||||||
do {
|
|
||||||
k = (i + j) / 2;
|
|
||||||
l = strcmp(p, tab[k]);
|
|
||||||
if (!l) {
|
|
||||||
return k;
|
|
||||||
}
|
|
||||||
if (l < 0) {
|
|
||||||
j = k;
|
|
||||||
} else {
|
|
||||||
i = k + 1;
|
|
||||||
}
|
|
||||||
} while (i != j);
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit f48ed5c8d1bdd36aae324d247924ddc36ee498e6
|
Subproject commit 80562c24629905821c5e8c91974475c3b1f41aa1
|
Loading…
Add table
Add a link
Reference in a new issue