Browse Source

Introjucer: tweaked VC2005 version number. Minor fix for Thread. Tweaked assertion method used in Xcode to allow continuation after an assertion.

tags/2021-05-28
jules 13 years ago
parent
commit
a9894dc15e
3 changed files with 3 additions and 5 deletions
  1. +1
    -1
      extras/Introjucer/Source/Project Saving/jucer_ProjectExport_MSVC.h
  2. +1
    -3
      modules/juce_core/system/juce_PlatformDefs.h
  3. +1
    -1
      modules/juce_core/threads/juce_Thread.cpp

+ 1
- 1
extras/Introjucer/Source/Project Saving/jucer_ProjectExport_MSVC.h View File

@@ -754,7 +754,7 @@ public:
protected:
String getProjectVersionString() const { return "8.00"; }
String getSolutionVersionString() const { return "8.00" + newLine + "# Visual C++ Express 2005"; }
String getSolutionVersionString() const { return "9.00" + newLine + "# Visual C++ Express 2005"; }
JUCE_DECLARE_NON_COPYABLE (MSVCProjectExporterVC2005);
};


+ 1
- 3
modules/juce_core/system/juce_PlatformDefs.h View File

@@ -60,14 +60,12 @@
#endif
//==============================================================================
#if JUCE_MAC || DOXYGEN
#if JUCE_MAC || JUCE_IOS || JUCE_LINUX || JUCE_ANDROID
/** This will try to break into the debugger if the app is currently being debugged.
If called by an app that's not being debugged, the behaiour isn't defined - it may crash or not, depending
on the platform.
@see jassert()
*/
#define juce_breakDebugger { assert (false); }
#elif JUCE_IOS || JUCE_LINUX || JUCE_ANDROID
#define juce_breakDebugger { ::kill (0, SIGTRAP); }
#elif JUCE_USE_INTRINSICS
#ifndef __INTEL_COMPILER


+ 1
- 1
modules/juce_core/threads/juce_Thread.cpp View File

@@ -224,7 +224,7 @@ bool Thread::waitForThreadToExit (const int timeOutMilliseconds) const
while (isThreadRunning())
{
if (timeOutMilliseconds > 0 && --count < 0)
if (timeOutMilliseconds >= 0 && --count < 0)
return false;
sleep (sleepMsPerIteration);


Loading…
Cancel
Save