Merge pull request #141 from dlang-community/stdx-allocs+Meson

wilzbach · web-flow · commit 257c0418f347 · 2019-03-16T13:15:13.000+01:00
Fix CI failure starting from DMD 2.085
diff --git a/.travis.yml b/.travis.yml
@@ -27,3 +27,4 @@ script:
   - ninja -j8 -C build test -v
   - git submodule update --init --recursive
   - make -B -C test/
+  - dub test
diff --git a/src/containers/unrolledlist.d b/src/containers/unrolledlist.d
@@ -565,7 +565,7 @@ private:
 			static if (BookkeepingType.sizeof < uint.sizeof)
 				immutable uint notReg = ~(cast(uint) registry);
 			else
-				immutable uint notReg = ~registry;
+				immutable uint notReg = cast(uint) (~registry);
 			version (LDC)
 			{
 				import ldc.intrinsics : llvm_cttz;
diff --git a/stdx-allocator b/stdx-allocator
@@ -1 +1 @@
-Subproject commit b7778fd6bf5f9aaaa87dd27f989cefbf9b3b365f
+Subproject commit d6e6ce4a838e0dad43ef13f050f96627339cdccd
diff --git a/subprojects/stdx-allocator.wrap b/subprojects/stdx-allocator.wrap
@@ -1,4 +1,4 @@
 [wrap-git]
 directory = stdx-allocator
 url       = https://github.com/dlang-community/stdx-allocator.git
-revision  = v2.77.4
+revision  = v2.77.5

Original file line number	Diff line number	Diff line change
`@@ -565,7 +565,7 @@ private:`
`565`	`565`	`static if (BookkeepingType.sizeof < uint.sizeof)`
`566`	`566`	`immutable uint notReg = ~(cast(uint) registry);`
`567`	`567`	`else`
`568`		`- immutable uint notReg = ~registry;`
	`568`	`+ immutable uint notReg = cast(uint) (~registry);`
`569`	`569`	`version (LDC)`
`570`	`570`	`{`
`571`	`571`	`import ldc.intrinsics : llvm_cttz;`