Mercurial > hg > octave-nkf
comparison src/load-path.cc @ 14861:f7afecdd87ef
maint: Use Octave coding conventions for cuddling parentheses in src/ directory
* bitfcns.cc, comment-list.cc, data.cc, defun.cc, error.cc, gl-render.cc,
graphics.cc, graphics.in.h, load-path.cc, load-path.h, load-save.cc,
ls-hdf5.cc, ls-mat4.cc, ls-mat5.cc, ls-oct-ascii.cc, mappers.cc, mex.cc,
oct-map.cc, oct-obj.cc, ov-base-int.cc, ov-base-mat.h, ov-base-sparse.cc,
ov-bool-mat.cc, ov-bool-sparse.cc, ov-cell.cc, ov-class.cc, ov-complex.cc,
ov-cx-mat.cc, ov-cx-sparse.cc, ov-fcn-handle.cc, ov-flt-cx-mat.cc,
ov-flt-re-mat.cc, ov-re-mat.cc, ov-re-sparse.cc, ov-scalar.cc, ov-str-mat.cc,
ov-struct.cc, ov-usr-fcn.cc, ov.cc, pr-output.cc, procstream.h, sighandlers.cc,
sparse-xdiv.cc, sparse-xpow.cc, sparse.cc, symtab.cc, syscalls.cc, sysdep.cc,
txt-eng-ft.cc, variables.cc, zfstream.cc, zfstream.h: Use Octave coding
conventions for cuddling parentheses.
| author | Rik <octave@nomad.inbox5.com> |
|---|---|
| date | Sat, 14 Jul 2012 06:22:56 -0700 |
| parents | 460a3c6d8bf1 |
| children | f10cddda37c5 |
comparison
equal
deleted
inserted
replaced
| 14860:e027f98403c3 | 14861:f7afecdd87ef |
|---|---|
| 530 i != dir_info_list.end (); | 530 i != dir_info_list.end (); |
| 531 /* conditionally advance iterator in loop body */) | 531 /* conditionally advance iterator in loop body */) |
| 532 { | 532 { |
| 533 //Don't remove it if it's gonna be added again, but remove it from | 533 //Don't remove it if it's gonna be added again, but remove it from |
| 534 //list of items to add, to avoid duplicates later on | 534 //list of items to add, to avoid duplicates later on |
| 535 std::set<std::string>::iterator j = new_elts.find(i->dir_name); | 535 std::set<std::string>::iterator j = new_elts.find (i->dir_name); |
| 536 if (j != new_elts.end ()) | 536 if (j != new_elts.end ()) |
| 537 { | 537 { |
| 538 new_elts.erase(j); | 538 new_elts.erase (j); |
| 539 i++; | 539 i++; |
| 540 } | 540 } |
| 541 else | 541 else |
| 542 { | 542 { |
| 543 //Warn if removing a default directory and not immediately adding | 543 //Warn if removing a default directory and not immediately adding |
| 544 //it back again | 544 //it back again |
| 545 if(i->is_init) | 545 if (i->is_init) |
| 546 warn_default_path_clobbered = true; | 546 warn_default_path_clobbered = true; |
| 547 i = dir_info_list.erase(i); | 547 i = dir_info_list.erase (i); |
| 548 } | 548 } |
| 549 } | 549 } |
| 550 | 550 |
| 551 if (warn_default_path_clobbered) | 551 if (warn_default_path_clobbered) |
| 552 warning_with_id ("Octave:remove-init-dir", | 552 warning_with_id ("Octave:remove-init-dir", |