projects
/
platform
/
core
/
uifw
/
dali-adaptor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "[Tizen] remove GetNativeWindowHandler() in devel window"
[platform/core/uifw/dali-adaptor.git]
/
adaptors
/
common
/
abort-handler.cpp
diff --git
a/adaptors/common/abort-handler.cpp
b/adaptors/common/abort-handler.cpp
index
eea7ec6
..
6f507a9
100644
(file)
--- a/
adaptors/common/abort-handler.cpp
+++ b/
adaptors/common/abort-handler.cpp
@@
-18,6
+18,9
@@
// CLASS HEADER
#include "abort-handler.h"
// CLASS HEADER
#include "abort-handler.h"
+// EXTERNAL INCLUDES
+#include <cstring>
+
namespace Dali
{
namespace Internal
namespace Dali
{
namespace Internal
@@
-27,7
+30,7
@@
namespace Adaptor
AbortHandler* AbortHandler::gInstance(NULL);
AbortHandler* AbortHandler::gInstance(NULL);
-AbortHandler::AbortHandler(
boost::function<void(void)> callback
)
+AbortHandler::AbortHandler(
CallbackBase* callback
)
: mSignalMask( 0 ),
mCallback( callback )
{
: mSignalMask( 0 ),
mCallback( callback )
{
@@
-39,6
+42,8
@@
AbortHandler::AbortHandler(boost::function<void(void)> callback)
AbortHandler::~AbortHandler()
{
AbortHandler::~AbortHandler()
{
+ delete mCallback;
+
int signum;
for ( signum = 1; signum < _NSIG; signum++ )
{
int signum;
for ( signum = 1; signum < _NSIG; signum++ )
{
@@
-59,13
+64,17
@@
bool AbortHandler::AbortOnSignal( int signum )
{
SignalHandlerFuncPtr signalHandlerPrevious = signal( signum, &AbortHandler::SignalHandler );
{
SignalHandlerFuncPtr signalHandlerPrevious = signal( signum, &AbortHandler::SignalHandler );
- if ( SIG_ERR != signalHandlerPrevious )
+// SIG_ERR is a macro with C cast
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wold-style-cast"
+ if ( SIG_ERR != signalHandlerPrevious )
{
mSignalOldHandlers[signum-1] = signalHandlerPrevious;
mSignalMask |= ( 1 << (signum-1) );
status = true;
}
}
{
mSignalOldHandlers[signum-1] = signalHandlerPrevious;
mSignalMask |= ( 1 << (signum-1) );
status = true;
}
}
+#pragma GCC diagnostic pop
return status;
}
return status;
}
@@
-75,7
+84,7
@@
void AbortHandler::SignalHandler( int signum )
{
if( gInstance->mCallback )
{
{
if( gInstance->mCallback )
{
-
gInstance->mCallback(
);
+
CallbackBase::Execute( *gInstance->mCallback
);
}
}
}
}
}
}