comparison src/DLD-FUNCTIONS/dlmread.cc @ 10806:7c542263a92a

omissions from last two patches
author Jaroslav Hajek <highegg@gmail.com>
date Tue, 20 Jul 2010 13:10:40 +0200
parents 3d5c6b84ddaf
children a9e9659e1dca
comparison
equal deleted inserted replaced
10805:8c858a1a2079 10806:7c542263a92a
336 r = (r > i + 1 ? r : i + 1); 336 r = (r > i + 1 ? r : i + 1);
337 j = 0; 337 j = 0;
338 size_t pos1 = 0; 338 size_t pos1 = 0;
339 do 339 do
340 { 340 {
341 octave_quit ();
342
341 size_t pos2 = line.find_first_of (sep, pos1); 343 size_t pos2 = line.find_first_of (sep, pos1);
342 std::string str = line.substr (pos1, pos2 - pos1); 344 std::string str = line.substr (pos1, pos2 - pos1);
343 345
344 if (sepflag && pos2 != std::string::npos) 346 if (sepflag && pos2 != std::string::npos)
345 // Treat consecutive separators as one. 347 // Treat consecutive separators as one.