Mercurial > octave

comparison libinterp/corefcn/sysdep.cc @ 22051:6db928d06b07

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
move signal functions into octave namespace * sighandlers.h, sighandlers.cc: Move all functions and variables into the octave namespace. Change all uses. (base_interrupt_manager, posix_interrupt_manager, interrupt_manager): New classes. (w32_interrupt_manager): Derive from base_interrupt_manager. Limit Windows-specific code to this class alone. (interrupt_manager::create_instance): Create w32_interrupt_manager instance on Windows systems.
author John W. Eaton <jwe@octave.org>
date Wed, 06 Jul 2016 18:31:40 -0400
parents 2d8e9bdf5683
children c2c668b3051b
comparison
equal deleted inserted replaced
22050:eb751495ba43 22051:6db928d06b07
521 521
522 #else 522 #else
523 raw_mode (true, wait); 523 raw_mode (true, wait);
524 524
525 // Get current handler. 525 // Get current handler.
526 octave_interrupt_handler saved_interrupt_handler 526 octave::interrupt_handler saved_interrupt_handler
527 = octave_ignore_interrupts (); 527 = octave::ignore_interrupts ();
528 528
529 // Restore it, disabling system call restarts (if possible) so the 529 // Restore it, disabling system call restarts (if possible) so the
530 // read can be interrupted. 530 // read can be interrupted.
531 531
532 octave_set_interrupt_handler (saved_interrupt_handler, false); 532 octave::set_interrupt_handler (saved_interrupt_handler, false);
533 533
534 int c = std::cin.get (); 534 int c = std::cin.get ();
535 535
536 if (std::cin.fail () || std::cin.eof ()) 536 if (std::cin.fail () || std::cin.eof ())
537 std::cin.clear (); 537 std::cin.clear ();
538 538
539 // Restore it, enabling system call restarts (if possible). 539 // Restore it, enabling system call restarts (if possible).
540 octave_set_interrupt_handler (saved_interrupt_handler, true); 540 octave::set_interrupt_handler (saved_interrupt_handler, true);
541 541
542 raw_mode (false, true); 542 raw_mode (false, true);
543 #endif 543 #endif
544 544
545 return c; 545 return c;