Skip to content
This repository was archived by the owner on Oct 12, 2022. It is now read-only.

Commit c05d5de

Browse files
authored
Merge pull request #2139 from WalterBright/getHash-scope
TypeInfo.getHash(): use const scope merged-on-behalf-of: Walter Bright <WalterBright@users.noreply.github.com>
2 parents 01643aa + affa409 commit c05d5de

35 files changed

+48
-48
lines changed

src/object.d

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ class TypeInfo
252252
* Bugs:
253253
* fix https://issues.dlang.org/show_bug.cgi?id=12516 e.g. by changing this to a truly safe interface.
254254
*/
255-
size_t getHash(in void* p) @trusted nothrow const { return cast(size_t)p; }
255+
size_t getHash(scope const void* p) @trusted nothrow const { return cast(size_t)p; }
256256

257257
/// Compares two instances for equality.
258258
bool equals(in void* p1, in void* p2) const { return p1 == p2; }
@@ -329,7 +329,7 @@ class TypeInfo_Enum : TypeInfo
329329
this.base == c.base;
330330
}
331331

332-
override size_t getHash(in void* p) const { return base.getHash(p); }
332+
override size_t getHash(scope const void* p) const { return base.getHash(p); }
333333
override bool equals(in void* p1, in void* p2) const { return base.equals(p1, p2); }
334334
override int compare(in void* p1, in void* p2) const { return base.compare(p1, p2); }
335335
override @property size_t tsize() nothrow pure const { return base.tsize; }
@@ -377,7 +377,7 @@ class TypeInfo_Pointer : TypeInfo
377377
return c && this.m_next == c.m_next;
378378
}
379379

380-
override size_t getHash(in void* p) @trusted const
380+
override size_t getHash(scope const void* p) @trusted const
381381
{
382382
return cast(size_t)*cast(void**)p;
383383
}
@@ -432,7 +432,7 @@ class TypeInfo_Array : TypeInfo
432432
return c && this.value == c.value;
433433
}
434434

435-
override size_t getHash(in void* p) @trusted const
435+
override size_t getHash(scope const void* p) @trusted const
436436
{
437437
void[] a = *cast(void[]*)p;
438438
return getArrayHash(value, a.ptr, a.length);
@@ -529,7 +529,7 @@ class TypeInfo_StaticArray : TypeInfo
529529
this.value == c.value;
530530
}
531531

532-
override size_t getHash(in void* p) @trusted const
532+
override size_t getHash(scope const void* p) @trusted const
533533
{
534534
return getArrayHash(value, p, len);
535535
}
@@ -655,7 +655,7 @@ class TypeInfo_AssociativeArray : TypeInfo
655655
return !!_aaEqual(this, *cast(const void**) p1, *cast(const void**) p2);
656656
}
657657

658-
override hash_t getHash(in void* p) nothrow @trusted const
658+
override hash_t getHash(scope const void* p) nothrow @trusted const
659659
{
660660
return _aaGetHash(cast(void*)p, this);
661661
}
@@ -702,7 +702,7 @@ class TypeInfo_Vector : TypeInfo
702702
return c && this.base == c.base;
703703
}
704704

705-
override size_t getHash(in void* p) const { return base.getHash(p); }
705+
override size_t getHash(scope const void* p) const { return base.getHash(p); }
706706
override bool equals(in void* p1, in void* p2) const { return base.equals(p1, p2); }
707707
override int compare(in void* p1, in void* p2) const { return base.compare(p1, p2); }
708708
override @property size_t tsize() nothrow pure const { return base.tsize; }
@@ -796,7 +796,7 @@ class TypeInfo_Delegate : TypeInfo
796796
return c && this.deco == c.deco;
797797
}
798798

799-
override size_t getHash(in void* p) @trusted const
799+
override size_t getHash(scope const void* p) @trusted const
800800
{
801801
return hashOf(*cast(void delegate()*)p);
802802
}
@@ -896,7 +896,7 @@ class TypeInfo_Class : TypeInfo
896896
return c && this.info.name == c.info.name;
897897
}
898898

899-
override size_t getHash(in void* p) @trusted const
899+
override size_t getHash(scope const void* p) @trusted const
900900
{
901901
auto o = *cast(Object*)p;
902902
return o ? o.toHash() : 0;
@@ -1051,7 +1051,7 @@ class TypeInfo_Interface : TypeInfo
10511051
return c && this.info.name == typeid(c).name;
10521052
}
10531053

1054-
override size_t getHash(in void* p) @trusted const
1054+
override size_t getHash(scope const void* p) @trusted const
10551055
{
10561056
Interface* pi = **cast(Interface ***)*cast(void**)p;
10571057
Object o = cast(Object)(*cast(void**)p - pi.offset);
@@ -1121,7 +1121,7 @@ class TypeInfo_Struct : TypeInfo
11211121
this.initializer().length == s.initializer().length;
11221122
}
11231123

1124-
override size_t getHash(in void* p) @trusted pure nothrow const
1124+
override size_t getHash(scope const void* p) @trusted pure nothrow const
11251125
{
11261126
assert(p);
11271127
if (xtoHash)
@@ -1296,7 +1296,7 @@ class TypeInfo_Tuple : TypeInfo
12961296
return false;
12971297
}
12981298

1299-
override size_t getHash(in void* p) const
1299+
override size_t getHash(scope const void* p) const
13001300
{
13011301
assert(0);
13021302
}
@@ -1367,7 +1367,7 @@ class TypeInfo_Const : TypeInfo
13671367
return base.opEquals(t.base);
13681368
}
13691369

1370-
override size_t getHash(in void *p) const { return base.getHash(p); }
1370+
override size_t getHash(scope const void *p) const { return base.getHash(p); }
13711371
override bool equals(in void *p1, in void *p2) const { return base.equals(p1, p2); }
13721372
override int compare(in void *p1, in void *p2) const { return base.compare(p1, p2); }
13731373
override @property size_t tsize() nothrow pure const { return base.tsize; }

src/rt/typeinfo/ti_Acdouble.d

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class TypeInfo_Ar : TypeInfo_Array
2525

2626
override string toString() const { return (F[]).stringof; }
2727

28-
override size_t getHash(in void* p) @trusted const
28+
override size_t getHash(scope const void* p) @trusted const
2929
{
3030
return Array!F.hashOf(*cast(F[]*)p);
3131
}

src/rt/typeinfo/ti_Acfloat.d

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class TypeInfo_Aq : TypeInfo_Array
2525

2626
override string toString() const { return (F[]).stringof; }
2727

28-
override size_t getHash(in void* p) @trusted const
28+
override size_t getHash(scope const void* p) @trusted const
2929
{
3030
return Array!F.hashOf(*cast(F[]*)p);
3131
}

src/rt/typeinfo/ti_Acreal.d

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class TypeInfo_Ac : TypeInfo_Array
2525

2626
override string toString() const { return (F[]).stringof; }
2727

28-
override size_t getHash(in void* p) @trusted const
28+
override size_t getHash(scope const void* p) @trusted const
2929
{
3030
return Array!F.hashOf(*cast(F[]*)p);
3131
}

src/rt/typeinfo/ti_Adouble.d

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class TypeInfo_Ad : TypeInfo_Array
2525

2626
override string toString() const { return (F[]).stringof; }
2727

28-
override size_t getHash(in void* p) @trusted const
28+
override size_t getHash(scope const void* p) @trusted const
2929
{
3030
return Array!F.hashOf(*cast(F[]*)p);
3131
}

src/rt/typeinfo/ti_Afloat.d

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class TypeInfo_Af : TypeInfo_Array
2525

2626
override string toString() const { return (F[]).stringof; }
2727

28-
override size_t getHash(in void* p) @trusted const
28+
override size_t getHash(scope const void* p) @trusted const
2929
{
3030
return Array!F.hashOf(*cast(F[]*)p);
3131
}

src/rt/typeinfo/ti_Ag.d

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class TypeInfo_Ag : TypeInfo_Array
2525

2626
override string toString() const { return "byte[]"; }
2727

28-
override size_t getHash(in void* p) @trusted const
28+
override size_t getHash(scope const void* p) @trusted const
2929
{
3030
const s = *cast(const void[]*)p;
3131
return rt.util.hash.hashOf(s, 0);
@@ -118,7 +118,7 @@ class TypeInfo_Aa : TypeInfo_Ah
118118
{
119119
override string toString() const { return "char[]"; }
120120

121-
override size_t getHash(in void* p) @trusted const
121+
override size_t getHash(scope const void* p) @trusted const
122122
{
123123
char[] s = *cast(char[]*)p;
124124
size_t hash = 0;

src/rt/typeinfo/ti_Aint.d

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class TypeInfo_Ai : TypeInfo_Array
2626

2727
override string toString() const { return "int[]"; }
2828

29-
override size_t getHash(in void* p) @trusted const
29+
override size_t getHash(scope const void* p) @trusted const
3030
{
3131
const s = *cast(const int[]*)p;
3232
return rt.util.hash.hashOf(s, 0);

src/rt/typeinfo/ti_Along.d

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class TypeInfo_Al : TypeInfo_Array
2424

2525
override string toString() const { return "long[]"; }
2626

27-
override size_t getHash(in void* p) @trusted const
27+
override size_t getHash(scope const void* p) @trusted const
2828
{
2929
const s = *cast(const long[]*)p;
3030
return rt.util.hash.hashOf(s, 0);

src/rt/typeinfo/ti_Areal.d

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class TypeInfo_Ae : TypeInfo_Array
2525

2626
override string toString() const { return (F[]).stringof; }
2727

28-
override size_t getHash(in void* p) @trusted const
28+
override size_t getHash(scope const void* p) @trusted const
2929
{
3030
return Array!F.hashOf(*cast(F[]*)p);
3131
}

0 commit comments

Comments
 (0)