Merge pull request #7094 from RazvanN7/Fix_for_19399

dlang-bot · web-flow · commit 275f3947d354 · 2019-06-27T16:23:45.000+02:00
Fix enum type in std.socket to match the receiver type
merged-on-behalf-of: Nicholas Wilson &lt;thewilsonator@users.noreply.github.com&gt;
diff --git a/std/experimental/allocator/building_blocks/stats_collector.d b/std/experimental/allocator/building_blocks/stats_collector.d
@@ -729,7 +729,7 @@ public:
         private void addPerCall(string f, uint n, names...)(ulong[] values...)
         {
             import std.array : join;
-            enum uint mask = mixin("Options."~[names].join("|Options."));
+            enum ulong mask = mixin("Options."~[names].join("|Options."));
             static if (perCallFlags & mask)
             {
                 // Per allocation info
diff --git a/std/parallelism.d b/std/parallelism.d
@@ -480,7 +480,7 @@ struct Task(alias fun, Args...)
         static if (isFunctionPointer!(_args[0]))
         {
             private enum bool isPure =
-            functionAttributes!(Args[0]) & FunctionAttribute.pure_;
+            (functionAttributes!(Args[0]) & FunctionAttribute.pure_) != 0;
         }
         else
         {
diff --git a/std/socket.d b/std/socket.d
@@ -325,7 +325,7 @@ shared static ~this() @system nothrow @nogc
 /**
  * The communication domain used to resolve an address.
  */
-enum AddressFamily: int
+enum AddressFamily: ushort
 {
     UNSPEC =     AF_UNSPEC,     /// Unspecified address family
     UNIX =       AF_UNIX,       /// Local communication

Original file line number	Diff line number	Diff line change
`@@ -729,7 +729,7 @@ public:`
`729`	`729`	`private void addPerCall(string f, uint n, names...)(ulong[] values...)`
`730`	`730`	`{`
`731`	`731`	`import std.array : join;`
`732`		`- enum uint mask = mixin("Options."~[names].join("\|Options."));`
	`732`	`+ enum ulong mask = mixin("Options."~[names].join("\|Options."));`
`733`	`733`	`static if (perCallFlags & mask)`
`734`	`734`	`{`
`735`	`735`	`// Per allocation info`
Original file line number	Diff line number	Diff line change
`@@ -480,7 +480,7 @@ struct Task(alias fun, Args...)`
`480`	`480`	`static if (isFunctionPointer!(_args[0]))`
`481`	`481`	`{`
`482`	`482`	`private enum bool isPure =`
`483`		`- functionAttributes!(Args[0]) & FunctionAttribute.pure_;`
	`483`	`+ (functionAttributes!(Args[0]) & FunctionAttribute.pure_) != 0;`
`484`	`484`	`}`
`485`	`485`	`else`
`486`	`486`	`{`
Original file line number	Diff line number	Diff line change
`@@ -325,7 +325,7 @@ shared static ~this() @system nothrow @nogc`
`325`	`325`	`/**`
`326`	`326`	`* The communication domain used to resolve an address.`
`327`	`327`	`*/`
`328`		`-enum AddressFamily: int`
	`328`	`+enum AddressFamily: ushort`
`329`	`329`	`{`
`330`	`330`	`UNSPEC = AF_UNSPEC, /// Unspecified address family`
`331`	`331`	`UNIX = AF_UNIX, /// Local communication`