diff mbox series

[committed] libphobos: Merge upstream phobos 99003a75a

Message ID 20200419142805.16488-1-ibuclaw@gdcproject.org
State New
Headers show
Series [committed] libphobos: Merge upstream phobos 99003a75a | expand

Commit Message

Iain Buclaw April 19, 2020, 2:28 p.m. UTC
Hi,

This patch merges libphobos with upstream phobos 99003a75a.

Fixes hasLength unittest to pass on X32.

Bootstrapped and regression tested on x86_64-linux-gnu with target_board
configurations {-m64,-m32,-mx32}.  Committed to mainline.

Regards
Iain.

---
 libphobos/src/MERGE                  | 2 +-
 libphobos/src/std/range/primitives.d | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
diff mbox series

Patch

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));