From 71c3ecaf174911348c5c1fb48cd2bde3e0c5b082 Mon Sep 17 00:00:00 2001 From: jules Date: Tue, 13 Aug 2013 12:42:40 +0100 Subject: [PATCH] Merged non-Windows implementations of Process::terminate, and made it call std::terminate() --- modules/juce_core/native/juce_android_Threads.cpp | 5 ----- modules/juce_core/native/juce_linux_Threads.cpp | 5 ----- modules/juce_core/native/juce_mac_Threads.mm | 5 ----- modules/juce_core/native/juce_posix_SharedCode.h | 4 ++++ 4 files changed, 4 insertions(+), 15 deletions(-) diff --git a/modules/juce_core/native/juce_android_Threads.cpp b/modules/juce_core/native/juce_android_Threads.cpp index 7eab465171..f3edbeba92 100644 --- a/modules/juce_core/native/juce_android_Threads.cpp +++ b/modules/juce_core/native/juce_android_Threads.cpp @@ -62,11 +62,6 @@ void Process::setPriority (ProcessPriority prior) pthread_setschedparam (pthread_self(), policy, ¶m); } -void Process::terminate() -{ - std::exit (EXIT_FAILURE); -} - JUCE_API bool JUCE_CALLTYPE juce_isRunningUnderDebugger() { return false; diff --git a/modules/juce_core/native/juce_linux_Threads.cpp b/modules/juce_core/native/juce_linux_Threads.cpp index cf406658ad..35c5bd8c7d 100644 --- a/modules/juce_core/native/juce_linux_Threads.cpp +++ b/modules/juce_core/native/juce_linux_Threads.cpp @@ -52,11 +52,6 @@ void Process::setPriority (const ProcessPriority prior) pthread_setschedparam (pthread_self(), policy, ¶m); } -void Process::terminate() -{ - std::exit (EXIT_FAILURE); -} - JUCE_API bool JUCE_CALLTYPE juce_isRunningUnderDebugger() { #if JUCE_BSD diff --git a/modules/juce_core/native/juce_mac_Threads.mm b/modules/juce_core/native/juce_mac_Threads.mm index b739d96458..30d70e876b 100644 --- a/modules/juce_core/native/juce_mac_Threads.mm +++ b/modules/juce_core/native/juce_mac_Threads.mm @@ -65,11 +65,6 @@ void Process::lowerPrivilege() jassertfalse; } -void Process::terminate() -{ - std::exit (EXIT_FAILURE); -} - void Process::setPriority (ProcessPriority) { // xxx diff --git a/modules/juce_core/native/juce_posix_SharedCode.h b/modules/juce_core/native/juce_posix_SharedCode.h index bc690c38bb..a32af2d714 100644 --- a/modules/juce_core/native/juce_posix_SharedCode.h +++ b/modules/juce_core/native/juce_posix_SharedCode.h @@ -150,6 +150,10 @@ void JUCE_CALLTYPE Thread::sleep (int millisecs) nanosleep (&time, nullptr); } +void Process::terminate() +{ + std::terminate(); +} //============================================================================== const juce_wchar File::separator = '/';