Mercurial > octave
diff libinterp/octave-value/ov-java.cc @ 30139:c789e728d57a
Backed out changeset 938794bc82b7
Renaming octave_base_value::count to m_count breaks some packages that
define new octave_value data types. Maybe those packages shouldn't be
touching the count directly, but they do. Since we may also want to
switch to using std::shared_ptr to manage octave_value objects instead
of our own custom reference counting implmentation, it is probably
best to delay this change until we know exactly what path we want to
take.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Wed, 08 Sep 2021 11:14:44 -0400 |
| parents | 14214fbfa258 |
| children | 91c6288781ba 796f54d4ddbf |
line wrap: on
line diff
--- a/libinterp/octave-value/ov-java.cc Wed Sep 08 06:46:19 2021 -0400 +++ b/libinterp/octave-value/ov-java.cc Wed Sep 08 11:14:44 2021 -0400 @@ -2198,7 +2198,7 @@ if (type.length () > 1 && type[1] == '(') { octave_value_list ovl; - m_count++; + count++; ovl(1) = octave_value (this); ovl(0) = (idx.front ())(0); auto it = idx.begin (); @@ -2209,7 +2209,7 @@ else { octave_value_list ovl; - m_count++; + count++; ovl(0) = octave_value (this); ovl(1) = (idx.front ())(0); retval = octave::F__java_get__ (ovl, 1); @@ -2264,13 +2264,13 @@ { // field assignment octave_value_list ovl; - m_count++; + count++; ovl(0) = octave_value (this); ovl(1) = (idx.front ())(0); ovl(2) = rhs; octave::F__java_set__ (ovl); - m_count++; + count++; retval = octave_value (this); } else if (type.length () > 2 && type[1] == '(') @@ -2286,7 +2286,7 @@ next_idx.erase (next_idx.begin ()); u(0).subsasgn (type.substr (2), next_idx, rhs); - m_count++; + count++; retval = octave_value (this); } else if (type[1] == '.') @@ -2297,7 +2297,7 @@ next_idx.erase (next_idx.begin ()); u(0).subsasgn (type.substr (1), next_idx, rhs); - m_count++; + count++; retval = octave_value (this); } else @@ -2310,7 +2310,7 @@ set_array_elements (current_env, TO_JOBJECT (to_java ()), idx.front (), rhs); - m_count++; + count++; retval = octave_value (this); } break;