From 46222af7dfaeb336a4edaef37d14c49d141dde2c Mon Sep 17 00:00:00 2001 From: Vinnie Falco Date: Wed, 3 Jul 2013 07:13:39 -0700 Subject: [PATCH] Fix beast macro calls --- .../beast/modules/beast_core/containers/beast_OwnedArray.h | 4 ++-- .../beast_core/containers/beast_ReferenceCountedArray.h | 4 ++-- .../beast/modules/beast_core/maths/beast_MathsFunctions.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Subtrees/beast/modules/beast_core/containers/beast_OwnedArray.h b/Subtrees/beast/modules/beast_core/containers/beast_OwnedArray.h index e63ff9271..04a62fc03 100644 --- a/Subtrees/beast/modules/beast_core/containers/beast_OwnedArray.h +++ b/Subtrees/beast/modules/beast_core/containers/beast_OwnedArray.h @@ -657,8 +657,8 @@ public: const bool deleteObjects = true) { const ScopedLockType lock (getLock()); - const int endIndex = jlimit (0, numUsed, startIndex + numberToRemove); - startIndex = jlimit (0, numUsed, startIndex); + const int endIndex = blimit (0, numUsed, startIndex + numberToRemove); + startIndex = blimit (0, numUsed, startIndex); if (endIndex > startIndex) { diff --git a/Subtrees/beast/modules/beast_core/containers/beast_ReferenceCountedArray.h b/Subtrees/beast/modules/beast_core/containers/beast_ReferenceCountedArray.h index d768d9c55..6df23a2c1 100644 --- a/Subtrees/beast/modules/beast_core/containers/beast_ReferenceCountedArray.h +++ b/Subtrees/beast/modules/beast_core/containers/beast_ReferenceCountedArray.h @@ -621,8 +621,8 @@ public: { const ScopedLockType lock (getLock()); - const int start = jlimit (0, numUsed, startIndex); - const int endIndex = jlimit (0, numUsed, startIndex + numberToRemove); + const int start = blimit (0, numUsed, startIndex); + const int endIndex = blimit (0, numUsed, startIndex + numberToRemove); if (endIndex > start) { diff --git a/Subtrees/beast/modules/beast_core/maths/beast_MathsFunctions.h b/Subtrees/beast/modules/beast_core/maths/beast_MathsFunctions.h index 29168654d..f4b7e288b 100644 --- a/Subtrees/beast/modules/beast_core/maths/beast_MathsFunctions.h +++ b/Subtrees/beast/modules/beast_core/maths/beast_MathsFunctions.h @@ -199,7 +199,7 @@ void findMinAndMax (const Type* values, int numValues, Type& lowest, Type& highe @param valueToConstrain the value to try to return @returns the closest value to valueToConstrain which lies between lowerLimit and upperLimit (inclusive) - @see jlimit0To, bmin, bmax + @see blimit0To, bmin, bmax */ template inline Type blimit (const Type lowerLimit,