Mercurial > octave-libgccjit

comparison libinterp/corefcn/load-save.cc @ 18868:2b82d2f29a7b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Periodic merge of gui-release to default.
author John W. Eaton <jwe@octave.org>
date Fri, 27 Jun 2014 11:56:19 -0400
parents 5bd1ca29c5f0 9a70705dc616
children d5db1019ad4a
comparison
equal deleted inserted replaced
18865:a0fd65914811 18868:2b82d2f29a7b
263 else 263 else
264 { 264 {
265 file.clear (); 265 file.clear ();
266 file.seekg (0, std::ios::beg); 266 file.seekg (0, std::ios::beg);
267 267
268 std::string tmp = extract_keyword (file, "name"); 268 std::string name_val = extract_keyword (file, "name");
269 269 std::string type_val = extract_keyword (file, "type");
270 if (! tmp.empty ()) 270
271 if (name_val.empty () != true && type_val.empty () != true)
271 retval = LS_ASCII; 272 retval = LS_ASCII;
272 else 273 else
273 { 274 {
274 file.clear (); 275 file.clear ();
275 file.seekg (0, std::ios::beg); 276 file.seekg (0, std::ios::beg);