AllSpiceMirrors/kicad
7
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-04-21 00:21:25 +00:00
Files Issues Releases Activity

Fix broken rebase

Browse Source
This commit is contained in:
Seth Hillbrand 2024-07-17 15:20:29 -07:00
parent 1d307d4429
commit a13df1ec28
1 changed files with 0 additions and 9 deletions

9
include/base_set.h
View File

@ -336,21 +336,12 @@ struct hash<BASE_SET>
{
size_t operator()( const BASE_SET& bs ) const
{
<<<<<<< HEAD
size_t hashVal = 0;
for( const auto& bit : bs )
hashVal = hashVal * 31 + std::hash<int>()( bit );
return hashVal;
=======
size_t hash_val = 0;
for( const auto& bit : bs )
hash_val = hash_val * 31 + std::hash<int>()( bit );
return hash_val;
>>>>>>> 7080b9e5f7 (Fix shadowing)
}
};
} // namespace std