Mercurial > octave-nkf
comparison src/toplev.cc @ 11066:e678346a47d9
toplev.cc, sighandlers.cc, utils.cc, octave.cc, pt-eval.cc pt-idx.cc: Octave_map to octave_map and octave_scalar_map conversion
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Thu, 30 Sep 2010 06:00:00 -0400 |
parents | cb62c7401ea2 |
children | 2c356a35d7f5 |
comparison
equal
deleted
inserted
replaced
11065:9bf6c927c267 | 11066:e678346a47d9 |
---|---|
1158 #else | 1158 #else |
1159 bool octave_supports_dynamic_linking = false; | 1159 bool octave_supports_dynamic_linking = false; |
1160 #endif | 1160 #endif |
1161 | 1161 |
1162 static bool initialized = false; | 1162 static bool initialized = false; |
1163 static Octave_map m; | 1163 static octave_scalar_map m; |
1164 | 1164 |
1165 struct conf_info_struct | 1165 struct conf_info_struct |
1166 { | 1166 { |
1167 bool subst_home; | 1167 bool subst_home; |
1168 const char *key; | 1168 const char *key; |
1359 const char *key = elt.key; | 1359 const char *key = elt.key; |
1360 | 1360 |
1361 if (key) | 1361 if (key) |
1362 { | 1362 { |
1363 if (elt.subst_home) | 1363 if (elt.subst_home) |
1364 m.assign (key, octave_value (subst_octave_home (elt.val))); | 1364 m.assign (key, subst_octave_home (elt.val)); |
1365 else | 1365 else |
1366 m.assign (key, octave_value (elt.val)); | 1366 m.assign (key, elt.val); |
1367 } | 1367 } |
1368 else | 1368 else |
1369 break; | 1369 break; |
1370 } | 1370 } |
1371 | 1371 |