mirror of
https://github.com/tomahawk-player/tomahawk.git
synced 2025-08-09 07:36:48 +02:00
* Fixed compiling on Windows. I hope.
This commit is contained in:
@@ -221,8 +221,8 @@ void ExceptionHandler::Initialize(const wstring& dump_path,
|
|||||||
previous_iph_ = _set_invalid_parameter_handler(HandleInvalidParameter);
|
previous_iph_ = _set_invalid_parameter_handler(HandleInvalidParameter);
|
||||||
#endif // _MSC_VER >= 1400
|
#endif // _MSC_VER >= 1400
|
||||||
|
|
||||||
if (handler_types & HANDLER_PURECALL)
|
// if (handler_types & HANDLER_PURECALL)
|
||||||
previous_pch_ = _set_purecall_handler(HandlePureVirtualCall);
|
// previous_pch_ = _set_purecall_handler(HandlePureVirtualCall);
|
||||||
|
|
||||||
LeaveCriticalSection(&handler_stack_critical_section_);
|
LeaveCriticalSection(&handler_stack_critical_section_);
|
||||||
}
|
}
|
||||||
@@ -248,8 +248,8 @@ ExceptionHandler::~ExceptionHandler() {
|
|||||||
_set_invalid_parameter_handler(previous_iph_);
|
_set_invalid_parameter_handler(previous_iph_);
|
||||||
#endif // _MSC_VER >= 1400
|
#endif // _MSC_VER >= 1400
|
||||||
|
|
||||||
if (handler_types_ & HANDLER_PURECALL)
|
// if (handler_types_ & HANDLER_PURECALL)
|
||||||
_set_purecall_handler(previous_pch_);
|
// _set_purecall_handler(previous_pch_);
|
||||||
|
|
||||||
if (handler_stack_->back() == this) {
|
if (handler_stack_->back() == this) {
|
||||||
handler_stack_->pop_back();
|
handler_stack_->pop_back();
|
||||||
@@ -382,7 +382,7 @@ class AutoExceptionHandler {
|
|||||||
#if _MSC_VER >= 1400 // MSVC 2005/8
|
#if _MSC_VER >= 1400 // MSVC 2005/8
|
||||||
_set_invalid_parameter_handler(handler_->previous_iph_);
|
_set_invalid_parameter_handler(handler_->previous_iph_);
|
||||||
#endif // _MSC_VER >= 1400
|
#endif // _MSC_VER >= 1400
|
||||||
_set_purecall_handler(handler_->previous_pch_);
|
// _set_purecall_handler(handler_->previous_pch_);
|
||||||
}
|
}
|
||||||
|
|
||||||
~AutoExceptionHandler() {
|
~AutoExceptionHandler() {
|
||||||
@@ -391,7 +391,7 @@ class AutoExceptionHandler {
|
|||||||
#if _MSC_VER >= 1400 // MSVC 2005/8
|
#if _MSC_VER >= 1400 // MSVC 2005/8
|
||||||
_set_invalid_parameter_handler(ExceptionHandler::HandleInvalidParameter);
|
_set_invalid_parameter_handler(ExceptionHandler::HandleInvalidParameter);
|
||||||
#endif // _MSC_VER >= 1400
|
#endif // _MSC_VER >= 1400
|
||||||
_set_purecall_handler(ExceptionHandler::HandlePureVirtualCall);
|
// _set_purecall_handler(ExceptionHandler::HandlePureVirtualCall);
|
||||||
|
|
||||||
--ExceptionHandler::handler_stack_index_;
|
--ExceptionHandler::handler_stack_index_;
|
||||||
LeaveCriticalSection(&ExceptionHandler::handler_stack_critical_section_);
|
LeaveCriticalSection(&ExceptionHandler::handler_stack_critical_section_);
|
||||||
|
Reference in New Issue
Block a user