mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-21 01:24:21 +00:00
Code Activity

Fix for iPhone3.1 atomics. Small addition to Range class.

Browse source
This commit is contained in:
Julian Storer 2010-05-14 09:40:17 +01:00
parent 0cfcfc3ba6
commit a43448df13
3 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
juce_amalgamated.h
View file

@ -5728,8 +5728,8 @@ public:
|| (JUCE_MAC && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 2)))
#define JUCE_ATOMICS_MAC 1 // Older OSX builds using gcc4.1 or earlier
#if JUCE_PPC
// None of these atomics are available in a PPC build!!
#if JUCE_PPC || JUCE_IPHONE
// None of these atomics are available for PPC or for iPhoneOS 3.1 or earlier!!
template <typename Type> static Type OSAtomicAdd64 (Type b, volatile Type* a) throw() { jassertfalse; return *a += b; }
template <typename Type> static Type OSAtomicIncrement64 (volatile Type* a) throw() { jassertfalse; return ++*a; }
template <typename Type> static Type OSAtomicDecrement64 (volatile Type* a) throw() { jassertfalse; return --*a; }
@ -9998,6 +9998,12 @@ public:
return jlimit (start, end, value);
}
/** Returns true if the given range lies entirely inside this range. */
bool contains (const Range& other) const throw()
{
return start <= other.start && end >= other.end;
}
/** Returns true if the given range intersects this one. */
bool intersects (const Range& other) const throw()
{

6
src/containers/juce_Range.h
View file

@ -213,6 +213,12 @@ public:
return jlimit (start, end, value);
}
/** Returns true if the given range lies entirely inside this range. */
bool contains (const Range& other) const throw()
{
return start <= other.start && end >= other.end;
}
/** Returns true if the given range intersects this one. */
bool intersects (const Range& other) const throw()
{

4
src/core/juce_Atomic.h
View file

@ -156,8 +156,8 @@ public:
|| (JUCE_MAC && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 2)))
#define JUCE_ATOMICS_MAC 1 // Older OSX builds using gcc4.1 or earlier
#if JUCE_PPC
// None of these atomics are available in a PPC build!!
#if JUCE_PPC || JUCE_IPHONE
// None of these atomics are available for PPC or for iPhoneOS 3.1 or earlier!!
template <typename Type> static Type OSAtomicAdd64 (Type b, volatile Type* a) throw() { jassertfalse; return *a += b; }
template <typename Type> static Type OSAtomicIncrement64 (volatile Type* a) throw() { jassertfalse; return ++*a; }
template <typename Type> static Type OSAtomicDecrement64 (volatile Type* a) throw() { jassertfalse; return --*a; }