dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Codechange: Add base() method to StrongType to allow access to the base type without casting. (#11445)

Browse Source 
This removes the ability to explicitly cast to the base type, but the requirement
to use .base() means the conversion is still explicit.
This commit is contained in:
Peter Nelson
2023-11-06 20:29:35 +00:00
committed by GitHub
parent 737775f834
commit ab535c0a86
73 changed files with 174 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/pathfinder/yapf/yapf_node.hpp
View File

@@ -25,7 +25,7 @@ struct CYapfNodeKeyExitDir {
inline int CalcHash() const
{
return m_exitdir | (static_cast<uint32_t>(m_tile) << 2);
return m_exitdir | (m_tile.base() << 2);
}
inline bool operator==(const CYapfNodeKeyExitDir &other) const
@@ -45,7 +45,7 @@ struct CYapfNodeKeyTrackDir : public CYapfNodeKeyExitDir
{
inline int CalcHash() const
{
return m_td | (static_cast<uint32_t>(m_tile) << 4);
return m_td | (m_tile.base() << 4);
}
inline bool operator==(const CYapfNodeKeyTrackDir &other) const

2
src/pathfinder/yapf/yapf_node_rail.hpp
View File

@@ -27,7 +27,7 @@ struct CYapfRailSegmentKey
inline void Set(const CYapfNodeKeyTrackDir &node_key)
{
m_value = (static_cast<uint32_t>(node_key.m_tile) << 4) | node_key.m_td;
m_value = (node_key.m_tile.base() << 4) | node_key.m_td;
}
inline int32_t CalcHash() const