diff options
| author | Iain Buclaw <ibuclaw@gdcproject.org> | 2020-04-19 15:48:27 +0200 |
|---|---|---|
| committer | Iain Buclaw <ibuclaw@gdcproject.org> | 2020-04-19 15:48:32 +0200 |
| commit | fc186077486fb6e5453157ad8507c66d0a34017c (patch) | |
| tree | 7def9c6a6f6a40fa5bc20d9319059a2251c651b7 /libphobos | |
| parent | 62f3d4ea899cc1d03e9cf9e1e80b6b4835b4e428 (diff) | |
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
Diffstat (limited to 'libphobos')
| -rw-r--r-- | libphobos/src/MERGE | 2 | ||||
| -rw-r--r-- | libphobos/src/std/range/primitives.d | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libphobos/src/MERGE b/libphobos/src/MERGE index 7570cd9b9fd..31a053ca2bb 100644 --- a/libphobos/src/MERGE +++ b/libphobos/src/MERGE @@ -1,4 +1,4 @@ -fb4f6a713f5b78742f93e072cff6a6c4ecf9323d +99003a75a883d4ae28b276763f4d1f2a360cf1dd The first line of this file holds the git revision number of the last merge done from the dlang/phobos repository. diff --git a/libphobos/src/std/range/primitives.d b/libphobos/src/std/range/primitives.d index 1a4e6fb2b91..193ee952cf3 100644 --- a/libphobos/src/std/range/primitives.d +++ b/libphobos/src/std/range/primitives.d @@ -1416,12 +1416,12 @@ unittest struct A { ulong length; } struct B { @property uint length() { return 0; } } - version (X86) + static if (is(size_t == uint)) { static assert(!hasLength!(A)); static assert(hasLength!(B)); } - else version(X86_64) + else static if (is(size_t == ulong)) { static assert(hasLength!(A)); static assert(!hasLength!(B)); |