From fc186077486fb6e5453157ad8507c66d0a34017c Mon Sep 17 00:00:00 2001
From: Iain Buclaw <ibuclaw@gdcproject.org>
Date: Sun, 19 Apr 2020 15:48:27 +0200
Subject: [PATCH] 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
---
libphobos/src/MERGE | 2 +-
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 7570cd9b9fd7..31a053ca2bb9 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 1a4e6fb2b910..193ee952cf3b 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));
--
GitLab