aboutsummaryrefslogtreecommitdiff
path: root/libphobos/src/std
diff options
context:
space:
mode:
authorIain Buclaw <ibuclaw@gdcproject.org>2020-04-19 15:48:27 +0200
committerIain Buclaw <ibuclaw@gdcproject.org>2020-04-19 15:48:32 +0200
commitfc186077486fb6e5453157ad8507c66d0a34017c (patch)
tree7def9c6a6f6a40fa5bc20d9319059a2251c651b7 /libphobos/src/std
parent62f3d4ea899cc1d03e9cf9e1e80b6b4835b4e428 (diff)
downloadgcc-fc186077486fb6e5453157ad8507c66d0a34017c.zip
gcc-fc186077486fb6e5453157ad8507c66d0a34017c.tar.gz
gcc-fc186077486fb6e5453157ad8507c66d0a34017c.tar.bz2
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/src/std')
-rw-r--r--libphobos/src/std/range/primitives.d4
1 files changed, 2 insertions, 2 deletions
diff --git a/libphobos/src/std/range/primitives.d b/libphobos/src/std/range/primitives.d
index 1a4e6fb..193ee95 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));