OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

libphobos: Merge upstream phobos 99003a75a 

Fixes hasLength unittest to pass on X32.

References: PR d/94609

Reviewed-on: https://github.com/dlang/phobos/pull/7448
This commit is contained in:
Iain Buclaw 2020-04-19 15:48:27 +02:00
parent 62f3d4ea89
commit fc18607748
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libphobos/src/MERGE
View File

@ -1,4 +1,4 @@
fb4f6a713f5b78742f93e072cff6a6c4ecf9323d 99003a75a883d4ae28b276763f4d1f2a360cf1dd
The first line of this file holds the git revision number of the last The first line of this file holds the git revision number of the last
merge done from the dlang/phobos repository. merge done from the dlang/phobos repository.

4
libphobos/src/std/range/primitives.d
View File

@ -1416,12 +1416,12 @@ unittest
struct A { ulong length; } struct A { ulong length; }
struct B { @property uint length() { return 0; } } struct B { @property uint length() { return 0; } }
version (X86) static if (is(size_t == uint))
{ {
static assert(!hasLength!(A)); static assert(!hasLength!(A));
static assert(hasLength!(B)); static assert(hasLength!(B));
} }
else version(X86_64) else static if (is(size_t == ulong))
{ {
static assert(hasLength!(A)); static assert(hasLength!(A));
static assert(!hasLength!(B)); static assert(!hasLength!(B));