comparison libinterp/corefcn/oct-map.cc @ 27957:c20b7290c778

merge stable to default.
author John W. Eaton <jwe@octave.org>
date Fri, 17 Jan 2020 13:27:27 -0600
parents bd51beb6205e 2310164737b3
children c40a367a84c0 0a5b15007766
comparison
equal deleted inserted replaced
27955:179ece36a2eb 27957:c20b7290c778
922 { 922 {
923 octave_idx_type n_idx = idx.length (); 923 octave_idx_type n_idx = idx.length ();
924 octave_map retval; 924 octave_map retval;
925 925
926 // If we catch an indexing error in index_vector, we flag an error in 926 // If we catch an indexing error in index_vector, we flag an error in
927 // index k. Ensure it is the right value befor each idx_vector call. 927 // index k. Ensure it is the right value before each idx_vector call.
928 // Same variable as used in the for loop in the default case. 928 // Same variable as used in the for loop in the default case.
929 929
930 octave_idx_type k = 0; 930 octave_idx_type k = 0;
931 931
932 try 932 try
1137 octave_map::assign (const octave_value_list& idx, const octave_map& rhs) 1137 octave_map::assign (const octave_value_list& idx, const octave_map& rhs)
1138 { 1138 {
1139 octave_idx_type n_idx = idx.length (); 1139 octave_idx_type n_idx = idx.length ();
1140 1140
1141 // If we catch an indexing error in index_vector, we flag an error in 1141 // If we catch an indexing error in index_vector, we flag an error in
1142 // index k. Ensure it is the right value befor each idx_vector call. 1142 // index k. Ensure it is the right value before each idx_vector call.
1143 // Same variable as used in the for loop in the default case. 1143 // Same variable as used in the for loop in the default case.
1144 1144
1145 octave_idx_type k = 0; 1145 octave_idx_type k = 0;
1146 1146
1147 try 1147 try