Commit 2a42ad4a authored by Gauthier Quesnel's avatar Gauthier Quesnel
Browse files

core: fix serveral warnings

parent a8c2f4fa
Pipeline #10585 passed with stage
in 1 minute and 13 seconds
...@@ -226,7 +226,7 @@ struct editor ...@@ -226,7 +226,7 @@ struct editor
} }
template<typename Dynamics> template<typename Dynamics>
void do_free(model& mdl, Dynamics& dyn) void do_free([[maybe_unused]] Dynamics& dyn)
{ {
if constexpr (is_detected_v<has_output_port_t, Dynamics>) { if constexpr (is_detected_v<has_output_port_t, Dynamics>) {
for (size_t i = 0, e = std::size(dyn.y); i != e; ++i) { for (size_t i = 0, e = std::size(dyn.y); i != e; ++i) {
...@@ -258,46 +258,46 @@ struct editor ...@@ -258,46 +258,46 @@ struct editor
switch (mdl->type) { switch (mdl->type) {
case dynamics_type::none: case dynamics_type::none:
do_free(*mdl, sim.none_models.get(mdl->id)); do_free(sim.none_models.get(mdl->id));
break; break;
case dynamics_type::integrator: case dynamics_type::integrator:
do_free(*mdl, sim.integrator_models.get(mdl->id)); do_free(sim.integrator_models.get(mdl->id));
break; break;
case dynamics_type::quantifier: case dynamics_type::quantifier:
do_free(*mdl, sim.quantifier_models.get(mdl->id)); do_free(sim.quantifier_models.get(mdl->id));
break; break;
case dynamics_type::adder_2: case dynamics_type::adder_2:
do_free(*mdl, sim.adder_2_models.get(mdl->id)); do_free(sim.adder_2_models.get(mdl->id));
break; break;
case dynamics_type::adder_3: case dynamics_type::adder_3:
do_free(*mdl, sim.adder_3_models.get(mdl->id)); do_free(sim.adder_3_models.get(mdl->id));
break; break;
case dynamics_type::adder_4: case dynamics_type::adder_4:
do_free(*mdl, sim.adder_4_models.get(mdl->id)); do_free(sim.adder_4_models.get(mdl->id));
break; break;
case dynamics_type::mult_2: case dynamics_type::mult_2:
do_free(*mdl, sim.mult_2_models.get(mdl->id)); do_free(sim.mult_2_models.get(mdl->id));
break; break;
case dynamics_type::mult_3: case dynamics_type::mult_3:
do_free(*mdl, sim.mult_3_models.get(mdl->id)); do_free(sim.mult_3_models.get(mdl->id));
break; break;
case dynamics_type::mult_4: case dynamics_type::mult_4:
do_free(*mdl, sim.mult_4_models.get(mdl->id)); do_free(sim.mult_4_models.get(mdl->id));
break; break;
case dynamics_type::counter: case dynamics_type::counter:
do_free(*mdl, sim.counter_models.get(mdl->id)); do_free(sim.counter_models.get(mdl->id));
break; break;
case dynamics_type::generator: case dynamics_type::generator:
do_free(*mdl, sim.generator_models.get(mdl->id)); do_free(sim.generator_models.get(mdl->id));
break; break;
case dynamics_type::constant: case dynamics_type::constant:
do_free(*mdl, sim.constant_models.get(mdl->id)); do_free(sim.constant_models.get(mdl->id));
break; break;
case dynamics_type::cross: case dynamics_type::cross:
do_free(*mdl, sim.cross_models.get(mdl->id)); do_free(sim.cross_models.get(mdl->id));
break; break;
case dynamics_type::time_func: case dynamics_type::time_func:
do_free(*mdl, sim.time_func_models.get(mdl->id)); do_free(sim.time_func_models.get(mdl->id));
break; break;
default: default:
irt_bad_return(status::unknown_dynamics); irt_bad_return(status::unknown_dynamics);
......
...@@ -803,7 +803,6 @@ public: ...@@ -803,7 +803,6 @@ public:
}; };
public: public:
using this_container = flat_list<T>;
using allocator_type = block_allocator<node_type>; using allocator_type = block_allocator<node_type>;
using value_type = T; using value_type = T;
using reference = T&; using reference = T&;
...@@ -880,7 +879,7 @@ public: ...@@ -880,7 +879,7 @@ public:
std::swap(node, other.node); std::swap(node, other.node);
} }
friend class this_container; friend class flat_list<T>;
}; };
class const_iterator class const_iterator
...@@ -954,7 +953,7 @@ public: ...@@ -954,7 +953,7 @@ public:
std::swap(node, other.node); std::swap(node, other.node);
} }
friend class this_container; friend class flat_list<T>;
}; };
private: private:
...@@ -2452,7 +2451,7 @@ public: ...@@ -2452,7 +2451,7 @@ public:
void free(T& t) noexcept void free(T& t) noexcept
{ {
data.free(id); data.free(t);
} }
/** /**
...@@ -4170,59 +4169,59 @@ struct simulation ...@@ -4170,59 +4169,59 @@ struct simulation
switch (mdl->type) { switch (mdl->type) {
case dynamics_type::none: case dynamics_type::none:
do_deallocate(*mdl, none_models.get(mdl->id)); do_deallocate(none_models.get(mdl->id));
none_models.free(mdl->id); none_models.free(mdl->id);
break; break;
case dynamics_type::integrator: case dynamics_type::integrator:
do_deallocate(*mdl, integrator_models.get(mdl->id)); do_deallocate(integrator_models.get(mdl->id));
integrator_models.free(mdl->id); integrator_models.free(mdl->id);
break; break;
case dynamics_type::quantifier: case dynamics_type::quantifier:
do_deallocate(*mdl, quantifier_models.get(mdl->id)); do_deallocate(quantifier_models.get(mdl->id));
quantifier_models.free(mdl->id); quantifier_models.free(mdl->id);
break; break;
case dynamics_type::adder_2: case dynamics_type::adder_2:
do_deallocate(*mdl, adder_2_models.get(mdl->id)); do_deallocate(adder_2_models.get(mdl->id));
adder_2_models.free(mdl->id); adder_2_models.free(mdl->id);
break; break;
case dynamics_type::adder_3: case dynamics_type::adder_3:
do_deallocate(*mdl, adder_3_models.get(mdl->id)); do_deallocate(adder_3_models.get(mdl->id));
adder_3_models.free(mdl->id); adder_3_models.free(mdl->id);
break; break;
case dynamics_type::adder_4: case dynamics_type::adder_4:
do_deallocate(*mdl, adder_4_models.get(mdl->id)); do_deallocate(adder_4_models.get(mdl->id));
adder_4_models.free(mdl->id); adder_4_models.free(mdl->id);
break; break;
case dynamics_type::mult_2: case dynamics_type::mult_2:
do_deallocate(*mdl, mult_2_models.get(mdl->id)); do_deallocate(mult_2_models.get(mdl->id));
mult_2_models.free(mdl->id); mult_2_models.free(mdl->id);
break; break;
case dynamics_type::mult_3: case dynamics_type::mult_3:
do_deallocate(*mdl, mult_3_models.get(mdl->id)); do_deallocate(mult_3_models.get(mdl->id));
mult_3_models.free(mdl->id); mult_3_models.free(mdl->id);
break; break;
case dynamics_type::mult_4: case dynamics_type::mult_4:
do_deallocate(*mdl, mult_4_models.get(mdl->id)); do_deallocate(mult_4_models.get(mdl->id));
mult_4_models.free(mdl->id); mult_4_models.free(mdl->id);
break; break;
case dynamics_type::counter: case dynamics_type::counter:
do_deallocate(*mdl, counter_models.get(mdl->id)); do_deallocate(counter_models.get(mdl->id));
counter_models.free(mdl->id); counter_models.free(mdl->id);
break; break;
case dynamics_type::generator: case dynamics_type::generator:
do_deallocate(*mdl, generator_models.get(mdl->id)); do_deallocate(generator_models.get(mdl->id));
generator_models.free(mdl->id); generator_models.free(mdl->id);
break; break;
case dynamics_type::constant: case dynamics_type::constant:
do_deallocate(*mdl, constant_models.get(mdl->id)); do_deallocate(constant_models.get(mdl->id));
constant_models.free(mdl->id); constant_models.free(mdl->id);
break; break;
case dynamics_type::cross: case dynamics_type::cross:
do_deallocate(*mdl, cross_models.get(mdl->id)); do_deallocate(cross_models.get(mdl->id));
cross_models.free(mdl->id); cross_models.free(mdl->id);
break; break;
case dynamics_type::time_func: case dynamics_type::time_func:
do_deallocate(*mdl, time_func_models.get(mdl->id)); do_deallocate(time_func_models.get(mdl->id));
time_func_models.free(mdl->id); time_func_models.free(mdl->id);
break; break;
default: default:
...@@ -4236,7 +4235,7 @@ struct simulation ...@@ -4236,7 +4235,7 @@ struct simulation
} }
template<typename Dynamics> template<typename Dynamics>
void do_deallocate(model& mdl, Dynamics& dyn) void do_deallocate([[maybe_unused]] Dynamics& dyn) noexcept
{ {
if constexpr (is_detected_v<has_output_port_t, Dynamics>) { if constexpr (is_detected_v<has_output_port_t, Dynamics>) {
for (size_t i = 0, e = std::size(dyn.y); i != e; ++i) { for (size_t i = 0, e = std::size(dyn.y); i != e; ++i) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment