Skip to content

fix clang build #2266

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
schombert merged 1 commit into from
May 16, 2026
Merged

fix clang build #2266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/economy/economy_production.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ inline constexpr float free_efficiency = 0.3f;
template<typename NATIONS, typename PROV>
auto max_rgo_efficiency(sys::state& state, NATIONS n, PROV p, dcon::commodity_id c) {
using VALUE = adaptive_ve::convert_to_float<NATIONS>;
using MASK = adaptive_ve::convert_to_bool<NATIONS>;
//using MASK = adaptive_ve::convert_to_bool<NATIONS>;

auto is_mine = state.world.commodity_get_is_mine(c);

Expand Down
2 changes: 1 addition & 1 deletion src/gui/factory_details.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,7 @@ void factory_details_main_inputs_row_t::update(sys::state& state, layout_window
factory_details_main_t& main = *((factory_details_main_t*)(parent));
// BEGIN main::inputs_row::update
values.clear();
for(int i = 0; i < economy::commodity_set::set_size; i++) {
for(uint32_t i = 0; i < economy::commodity_set::set_size; i++) {
auto& value = main.last_explanation.primary_inputs;
if (!value.commodity_type[i]) break;
add_commodity_row(value.commodity_type[i], value.commodity_actual_amount[i], value.efficient_ratio[i], value.commodity_price[i]);
Expand Down
2 changes: 1 addition & 1 deletion src/map/map.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2869,7 +2869,7 @@ void display_data::update_sprawl(sys::state& state) {
//N = 5;
//}

square::tangent start { settlement.first / size, { 0.f, 1.f } };
square::tangent start { { settlement.first / size }, { 0.f, 1.f } };

int N = 10;
for(int layer = 0; layer >= ((center == 0 && is_capital) ? -1 : 0); layer--) {
Expand Down
Loading