Skip to content

Commit f4e24c2

Browse files
authored
Merge pull request #653 from OpenVicProject/fix/clang-tidy
Apply suggested clang-tidy fixes
2 parents 7f366b6 + 1966c31 commit f4e24c2

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

src/openvic-simulation/dataloader/Vic2PathSearch_Windows.hpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#pragma once
2+
#ifdef _WIN32
23

34
#include <concepts>
45
#pragma comment(lib, "advapi32.lib")
@@ -160,3 +161,4 @@ namespace OpenVic::Windows {
160161
return ReadRegValue<RCHAR_T>(root, key_sv, name_sv);
161162
}
162163
}
164+
#endif

src/openvic-simulation/economy/production/ProductionType.hpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ namespace OpenVic {
101101
struct ProductionTypeManager {
102102
private:
103103
IdentifierRegistry<ProductionType> IDENTIFIER_REGISTRY(production_type);
104-
pop_sprite_t PROPERTY(rgo_owner_sprite);
104+
pop_sprite_t PROPERTY(rgo_owner_sprite, 0);
105105
OV_IFLATMAP_PROPERTY(GoodDefinition, ProductionType const*, good_to_rgo_production_type);
106106

107107
NodeTools::node_callback_t _expect_job(
@@ -115,8 +115,7 @@ namespace OpenVic {
115115

116116
public:
117117
constexpr ProductionTypeManager()
118-
: rgo_owner_sprite { 0 },
119-
good_to_rgo_production_type { decltype(good_to_rgo_production_type)::create_empty() } {}
118+
: good_to_rgo_production_type { decltype(good_to_rgo_production_type)::create_empty() } {}
120119

121120
bool add_production_type(
122121
GameRulesManager const& game_rules_manager,

src/openvic-simulation/types/HasIndex.hpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
#pragma once
22

33
#include <concepts>
4+
#include <cstddef>
45

56
namespace OpenVic {
6-
template<typename TypeTag, std::integral IndexT = size_t>
7+
template<typename TypeTag, std::integral IndexT = std::size_t>
78
class HasIndex {
89
public:
910
using index_t = IndexT;

0 commit comments

Comments
 (0)