mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-12-04 13:04:30 +00:00
Code Issues Releases Wiki Activity

Merge branch 'fix_clang_tidy' into 'master'

Browse source 
Fix clang-tidy checks

See merge request OpenMW/openmw!4980
This commit is contained in:
Evil Eye 2025-11-06 16:31:44 +00:00
commit 39d117e362
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.gitlab-ci.yml
View file

@ -429,7 +429,11 @@ Ubuntu_Clang:
- mkdir -pv "${CCACHE_DIR}" - mkdir -pv "${CCACHE_DIR}"
- ccache -z -M "${CCACHE_SIZE}" - ccache -z -M "${CCACHE_SIZE}"
- CI/before_script.linux.sh - CI/before_script.linux.sh
- cp extern/.clang-tidy build/.clang-tidy - mkdir -p build/extern build/apps/launcher build/apps/opencs build/apps/wizard
- cp extern/.clang-tidy build/extern/
- cp extern/.clang-tidy build/apps/launcher/
- cp extern/.clang-tidy build/apps/opencs/
- cp extern/.clang-tidy build/apps/wizard/
- cd build - cd build
- find . -name *.o -exec touch {} \; - find . -name *.o -exec touch {} \;
- cmake --build . -- -j $(nproc) ${BUILD_TARGETS} - cmake --build . -- -j $(nproc) ${BUILD_TARGETS}

9
components/lua/util.hpp
View file

@ -2,7 +2,6 @@
#define COMPONENTS_LUA_UTIL_H #define COMPONENTS_LUA_UTIL_H
#include <cstdint> #include <cstdint>
#include <string>
#include <sol/sol.hpp> #include <sol/sol.hpp>
@ -24,11 +23,11 @@ namespace LuaUtil
// ADL-based customization point for sol2 to automatically convert ESM::RefId // ADL-based customization point for sol2 to automatically convert ESM::RefId
// Empty RefIds are converted to nil, non-empty ones are serialized to strings // Empty RefIds are converted to nil, non-empty ones are serialized to strings
inline int sol_lua_push(sol::types<ESM::RefId>, lua_State* L, const ESM::RefId& id) inline int sol_lua_push(sol::types<ESM::RefId>, lua_State* state, const ESM::RefId& id)
{ {
if (id.empty()) if (id.empty())
return sol::stack::push(L, sol::lua_nil); return sol::stack::push(state, sol::lua_nil);
return sol::stack::push(L, id.serializeText()); return sol::stack::push(state, id.serializeText());
} }
#endif #endif