From 44d1ab1bc2e68af5b69538ad6ee95f690e2c232c Mon Sep 17 00:00:00 2001 From: Johann Dreo Date: Fri, 5 Nov 2010 14:28:28 +0100 Subject: [PATCH] name of variables in english ; use the eo::log instead of cerr ; doc grouping --- eo/src/eoCtrlCContinue.cpp | 14 +++++++++++--- eo/src/eoCtrlCContinue.h | 4 ++-- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/eo/src/eoCtrlCContinue.cpp b/eo/src/eoCtrlCContinue.cpp index cf6146e6..0e04422a 100644 --- a/eo/src/eoCtrlCContinue.cpp +++ b/eo/src/eoCtrlCContinue.cpp @@ -28,11 +28,18 @@ #pragma warning(disable:4786) #endif +#include + #include #include +/** + * @addtogroup Continuators + * @{ + */ + // --- Global variables - but don't know what else to do - MS --- -bool arret_demande = false; +bool ask_for_stop = false; bool existCtrlCContinue = false; // @@ -46,9 +53,10 @@ void signal_handler( int sig ) #ifdef SIGQUIT signal( SIGINT, SIG_IGN ); signal( SIGQUIT, SIG_IGN ); - std::cerr << "Ctrl C entered ... closing down" << std::endl ; - arret_demande = true; + eo::log << eo::logging << "Ctrl C entered ... closing down" << std::endl ; + ask_for_stop = true; #endif #endif } +/** @} */ diff --git a/eo/src/eoCtrlCContinue.h b/eo/src/eoCtrlCContinue.h index b102a18e..9b1aac0f 100644 --- a/eo/src/eoCtrlCContinue.h +++ b/eo/src/eoCtrlCContinue.h @@ -38,7 +38,7 @@ * @{ */ -extern bool arret_demande, existCtrlCContinue; +extern bool ask_for_stop, existCtrlCContinue; extern void signal_handler( int sig ); @@ -73,7 +73,7 @@ public: virtual bool operator() ( const eoPop& _vEO ) { (void)_vEO; - if (arret_demande) + if (ask_for_stop) return false; return true; }