sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Try to fix GCC error" 

This reverts commit 11d5eb7d6063e6cf1da276cc5981d2d57e13f05e.
This commit is contained in:
Jérôme Leclercq 2022-03-15 09:02:30 +01:00
parent 9b1d8b5fcf
commit 79a5716110
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/Nazara/Core/Algorithm.hpp
View File

@ -40,7 +40,7 @@ namespace Nz
template<typename T> void HashCombine(std::size_t& seed, const T& v); template<typename T> void HashCombine(std::size_t& seed, const T& v);
template<typename T> bool IsPowerOfTwo(T value); template<typename T> bool IsPowerOfTwo(T value);
template<typename K, typename V> V& Retrieve(std::unordered_map<K, V>& map, const K& key); template<typename K, typename V> V& Retrieve(std::unordered_map<K, V>& map, const K& key);
template<typename K, typename V> const V& RetrieveConst(const std::unordered_map<K, V>& map, const K& key); template<typename K, typename V> const V& Retrieve(const std::unordered_map<K, V>& map, const K& key);
template<typename T> T ReverseBits(T integer); template<typename T> T ReverseBits(T integer);
template<typename To, typename From> To SafeCast(From&& value); template<typename To, typename From> To SafeCast(From&& value);
template<typename T, typename U>std::unique_ptr<T> StaticUniquePointerCast(std::unique_ptr<U>&& ptr); template<typename T, typename U>std::unique_ptr<T> StaticUniquePointerCast(std::unique_ptr<U>&& ptr);

2
include/Nazara/Core/Algorithm.inl
View File

@ -388,7 +388,7 @@ namespace Nz
* \param key Key, has to exist in map * \param key Key, has to exist in map
*/ */
template<typename K, typename V> template<typename K, typename V>
const V& RetrieveConst(const std::unordered_map<K, V>& map, const K& key) const V& Retrieve(const std::unordered_map<K, V>& map, const K& key)
{ {
auto it = map.find(key); auto it = map.find(key);
assert(it != map.end()); assert(it != map.end());

2
src/Nazara/Shader/LangWriter.cpp
View File

@ -605,7 +605,7 @@ namespace Nz
template<typename T> template<typename T>
void LangWriter::AppendIdentifier(const T& map, std::size_t id) void LangWriter::AppendIdentifier(const T& map, std::size_t id)
{ {
const auto& structIdentifier = RetrieveConst(map, id); const auto& structIdentifier = Retrieve(map, id);
if (structIdentifier.moduleIndex != m_currentState->currentModuleIndex) if (structIdentifier.moduleIndex != m_currentState->currentModuleIndex)
Append(m_currentState->moduleNames[structIdentifier.moduleIndex], '.'); Append(m_currentState->moduleNames[structIdentifier.moduleIndex], '.');

2
src/Nazara/Shader/SpirvAstVisitor.cpp
View File

@ -31,7 +31,7 @@ namespace Nz
auto SpirvAstVisitor::GetVariable(std::size_t varIndex) const -> const Variable& auto SpirvAstVisitor::GetVariable(std::size_t varIndex) const -> const Variable&
{ {
return RetrieveConst(m_variables, varIndex); return Retrieve(m_variables, varIndex);
} }
void SpirvAstVisitor::Visit(ShaderAst::AccessIndexExpression& node) void SpirvAstVisitor::Visit(ShaderAst::AccessIndexExpression& node)