aboutsummaryrefslogtreecommitdiff
path: root/libphobos/src/std/checkedint.d
diff options
context:
space:
mode:
authorIain Buclaw <ibuclaw@gdcproject.org>2022-12-09 18:59:38 +0100
committerIain Buclaw <ibuclaw@gdcproject.org>2022-12-11 17:17:58 +0100
commit6d799f0aed18be25a5c908499b6411ab6d06b78c (patch)
tree3e6a91048c7fe3e78bae9f75b24eb37c5504681b /libphobos/src/std/checkedint.d
parentcc7f509d3c0b3ab63891cf7ca2def0fdfb3642c4 (diff)
downloadgcc-6d799f0aed18be25a5c908499b6411ab6d06b78c.zip
gcc-6d799f0aed18be25a5c908499b6411ab6d06b78c.tar.gz
gcc-6d799f0aed18be25a5c908499b6411ab6d06b78c.tar.bz2
d: Merge upstream dmd, druntime c8ae4adb2e, phobos 792c8b7c1.
D front-end changes: - Import dmd v2.101.0. - Deprecate the ability to call `__traits(getAttributes)' on overload sets. - Deprecate non-empty `for' statement increment clause with no effect. - Array literals assigned to `scope' array variables can now be allocated on the stack. D runtime changes: - Import druntime v2.101.0. Phobos changes: - Import phobos v2.101.0. gcc/d/ChangeLog: * dmd/MERGE: Merge upstream dmd c8ae4adb2e. * typeinfo.cc (check_typeinfo_type): Update for new front-end interface. (TypeInfoVisitor::visit (TypeInfoStructDeclaration *)): Remove warning that toHash() must be declared 'nothrow @safe`. libphobos/ChangeLog: * libdruntime/MERGE: Merge upstream druntime c8ae4adb2e. * src/MERGE: Merge upstream phobos 792c8b7c1.
Diffstat (limited to 'libphobos/src/std/checkedint.d')
-rw-r--r--libphobos/src/std/checkedint.d18
1 files changed, 9 insertions, 9 deletions
diff --git a/libphobos/src/std/checkedint.d b/libphobos/src/std/checkedint.d
index 635c420..79597e8 100644
--- a/libphobos/src/std/checkedint.d
+++ b/libphobos/src/std/checkedint.d
@@ -630,36 +630,36 @@ if (isIntegral!T || is(T == Checked!(U, H), U, H))
import core.atomic : atomicLoad, MemoryOrder;
static if (is(typeof(this.payload.atomicLoad!(MemoryOrder.acq)) P))
{
- auto payload = __ctfe ? cast(P) this.payload
+ auto localPayload = __ctfe ? cast(P) this.payload
: this.payload.atomicLoad!(MemoryOrder.acq);
}
else
{
- alias payload = this.payload;
+ alias localPayload = this.payload;
}
static if (hasMember!(Hook, "hookToHash"))
{
- return hook.hookToHash(payload);
+ return hook.hookToHash(localPayload);
}
else static if (stateSize!Hook > 0)
{
- static if (hasMember!(typeof(payload), "toHash"))
+ static if (hasMember!(typeof(localPayload), "toHash"))
{
- return payload.toHash() ^ hashOf(hook);
+ return localPayload.toHash() ^ hashOf(hook);
}
else
{
- return hashOf(payload) ^ hashOf(hook);
+ return hashOf(localPayload) ^ hashOf(hook);
}
}
- else static if (hasMember!(typeof(payload), "toHash"))
+ else static if (hasMember!(typeof(localPayload), "toHash"))
{
- return payload.toHash();
+ return localPayload.toHash();
}
else
{
- return .hashOf(payload);
+ return .hashOf(localPayload);
}
}