Skip to content

Commit 00a085e

Browse files
committed
CvRandom: move mixAssign specialization
gcc compatibility
1 parent f1ff9bd commit 00a085e

1 file changed

Lines changed: 7 additions & 7 deletions

File tree

CvGameCoreDLL_Expansion2/CvRandom.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,6 @@ struct NODISCARD CvSeeder {
6363
return mixRawAssign(hash32(static_cast<uint>(otherValue)));
6464
}
6565

66-
// `mixAssign` is specialized for mixing two seeders.
67-
// This is done to avoid rehashing the value within the seeder because it is presumably already hashed.
68-
template<> inline CvSeeder& mixAssign<CvSeeder>(CvSeeder otherSeed)
69-
{
70-
return mixRawAssign(otherSeed.value);
71-
}
72-
7366
template<typename T> inline CvSeeder mixRaw(T otherValue) const
7467
{
7568
CvSeeder newSeed = *this;
@@ -90,6 +83,13 @@ struct NODISCARD CvSeeder {
9083
}
9184
};
9285

86+
// `mixAssign` is specialized for mixing two seeders.
87+
// This is done to avoid rehashing the value within the seeder because it is presumably already hashed.
88+
template<> inline CvSeeder& CvSeeder::mixAssign<CvSeeder>(CvSeeder otherSeed)
89+
{
90+
return mixRawAssign(otherSeed.value);
91+
}
92+
9393
class CvRandom
9494
{
9595

0 commit comments

Comments
 (0)