aboutsummaryrefslogtreecommitdiff
path: root/libphobos/src
diff options
context:
space:
mode:
Diffstat (limited to 'libphobos/src')
-rw-r--r--libphobos/src/MERGE2
-rw-r--r--libphobos/src/std/bitmanip.d2
2 files changed, 2 insertions, 2 deletions
diff --git a/libphobos/src/MERGE b/libphobos/src/MERGE
index a4f25db..79cd181 100644
--- a/libphobos/src/MERGE
+++ b/libphobos/src/MERGE
@@ -1,4 +1,4 @@
-92dc5a4e98591a0e6b0af4ff0f84f096fea09016
+8729740e3221cd6dcccdbbbb12b452d0ee9c1ee1
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/bitmanip.d b/libphobos/src/std/bitmanip.d
index c9813e3..61c6c20 100644
--- a/libphobos/src/std/bitmanip.d
+++ b/libphobos/src/std/bitmanip.d
@@ -3274,7 +3274,7 @@ if (canSwapEndianness!T && n == T.sizeof)
assert(c == littleEndianToNative!dchar(swappedC));
}
-private T endianToNativeImpl(bool swap, T, size_t n)(ubyte[n] val) @nogc nothrow pure @safe
+private T endianToNativeImpl(bool swap, T, size_t n)(ubyte[n] val) @nogc nothrow pure @trusted
if (__traits(isIntegral, T) && n == T.sizeof)
{
if (!__ctfe)