Skip to content

Commit

Permalink
Explicitly cast min::symbol to max::t_symbol
Browse files Browse the repository at this point in the history
Required because the object-method signature has void* as a second argument instead of t_symbol*
  • Loading branch information
isabelgk committed Jan 18, 2024
1 parent 49a6e85 commit 0f89ccb
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions include/c74_min_attribute.h
Original file line number Diff line number Diff line change
Expand Up @@ -946,7 +946,7 @@ namespace c74::min {

template<class T>
max::t_max_err min_attr_getter(minwrap<T>* self, max::t_object* maxattr, long* ac, max::t_atom** av) {
const symbol attr_name = static_cast<const max::t_symbol*>(max::object_method(maxattr, k_sym_getname));
const symbol attr_name = static_cast<const max::t_symbol*>(max::object_method(maxattr, static_cast<max::t_symbol*>(k_sym_getname)));
auto& attr = self->m_min_object.attributes()[attr_name.c_str()];
atoms rvals = *attr;

Expand All @@ -971,7 +971,7 @@ namespace c74::min {

template<class T>
max::t_max_err min_attr_setter(minwrap<T>* self, max::t_object* maxattr, const long ac, const max::t_atom* av) {
const symbol attr_name { static_cast<const max::t_symbol*>(max::object_method(maxattr, k_sym_getname)) };
const symbol attr_name { static_cast<const max::t_symbol*>(max::object_method(maxattr, static_cast<max::t_symbol*>(k_sym_getname))) };
auto attr { self->m_min_object.attributes()[attr_name.c_str()] };

if (attr) {
Expand Down
2 changes: 1 addition & 1 deletion include/c74_min_notification.h
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ namespace c74::min {
auto attr_name() const {
symbol attribute_name;
if (is_attr_modified()) {
auto retval = c74::max::object_method(m_data, k_sym_getname);
auto retval = c74::max::object_method(m_data, static_cast<max::t_symbol*>(k_sym_getname));
attribute_name = static_cast<c74::max::t_symbol*>(retval);
}
return attribute_name;
Expand Down
6 changes: 3 additions & 3 deletions include/c74_min_operator_matrix.h
Original file line number Diff line number Diff line change
Expand Up @@ -523,9 +523,9 @@ namespace c74::min {
auto out_matrix = static_cast<max::t_object*>(max::object_method(outputs, max::_jit_sym_getindex, 0));

if (max::object_classname(in_matrix) != max::_jit_sym_jit_matrix)
in_matrix = static_cast<max::t_object*>(max::object_method(in_matrix, k_sym_getmatrix));
in_matrix = static_cast<max::t_object*>(max::object_method(in_matrix, static_cast<max::t_symbol*>(k_sym_getmatrix)));
if (max::object_classname(out_matrix) != max::_jit_sym_jit_matrix)
out_matrix = static_cast<max::t_object*>(max::object_method(out_matrix, k_sym_getmatrix));
out_matrix = static_cast<max::t_object*>(max::object_method(out_matrix, static_cast<max::t_symbol*>(k_sym_getmatrix));

if (!self || !in_matrix || !out_matrix)
err = max::JIT_ERR_INVALID_PTR;
Expand Down Expand Up @@ -607,7 +607,7 @@ namespace c74::min {
auto outputs = static_cast<max::t_object*>(max::object_method((max::t_object*)mop, max::_jit_sym_getoutputlist));
max::t_jit_err err = max::JIT_ERR_NONE;
auto out_mop_io = static_cast<max::t_object*>(max::object_method(outputs, max::_jit_sym_getindex, 0));
auto out_matrix = static_cast<max::t_object*>(max::object_method(out_mop_io, k_sym_getmatrix));
auto out_matrix = static_cast<max::t_object*>(max::object_method(out_mop_io, static_cast<max::t_symbol*>(k_sym_getmatrix)));

if (!self || !out_matrix) {
err = max::JIT_ERR_INVALID_PTR;
Expand Down
2 changes: 1 addition & 1 deletion include/c74_min_patcher.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ namespace c74::min {
void instantiate(const symbol a_name, const T1 arg1) {
if (m_instance && m_own)
max::object_free(m_instance);
m_instance = (max::t_object*)max::object_new(max::CLASS_NOBOX, a_name, arg1, 0);
m_instance = (max::t_object*)max::object_new(max::CLASS_NOBOX, static_cast<max::t_symbol*>(a_name), arg1, 0);
}


Expand Down

0 comments on commit 0f89ccb

Please sign in to comment.