diff --git a/juce_amalgamated.cpp b/juce_amalgamated.cpp index 717f1ecb7b..6a04c4df6d 100644 --- a/juce_amalgamated.cpp +++ b/juce_amalgamated.cpp @@ -229811,7 +229811,7 @@ public: if (select (socketHandle + 1, &readbits, 0, 0, &tv) <= 0) return 0; // (timeout) - const int bytesRead = jmax (0, recv (socketHandle, buffer, bytesToRead, MSG_WAITALL)); + const int bytesRead = jmax (0, (int) recv (socketHandle, buffer, bytesToRead, MSG_WAITALL)); readPosition += bytesRead; return bytesRead; } diff --git a/src/containers/juce_Array.h b/src/containers/juce_Array.h index d33f71e8fe..133c9c4815 100644 --- a/src/containers/juce_Array.h +++ b/src/containers/juce_Array.h @@ -70,7 +70,7 @@ public: other.lockArray(); numUsed = other.numUsed; data.setAllocatedSize (other.numUsed); - + for (int i = 0; i < numUsed; ++i) new (data.elements + i) ElementType (other.data.elements[i]); @@ -122,11 +122,11 @@ public: if (other.size() > numUsed) { data.ensureAllocatedSize (other.size()); - + int i = 0; for (; i < numUsed; ++i) data.elements[i] = other.data.elements[i]; - + numUsed = other.size(); for (; i < numUsed; ++i) new (data.elements + i) ElementType (other.data.elements[i]); @@ -134,7 +134,7 @@ public: else { numUsed = other.size(); - + for (int i = 0; i < numUsed; ++i) data.elements[i] = other.data.elements[i]; @@ -462,7 +462,7 @@ public: lock.enter(); data.ensureAllocatedSize (numUsed + numberOfTimesToInsertIt); ElementType* insertPos; - + if (((unsigned int) indexToInsertAt) < (unsigned int) numUsed) { insertPos = data.elements + indexToInsertAt; @@ -847,7 +847,7 @@ public: void removeLast (int howManyToRemove = 1) throw() { lock.enter(); - + if (howManyToRemove > numUsed) howManyToRemove = numUsed; diff --git a/src/containers/juce_ArrayAllocationBase.h b/src/containers/juce_ArrayAllocationBase.h index fdd7550dab..fa0ff90a6c 100644 --- a/src/containers/juce_ArrayAllocationBase.h +++ b/src/containers/juce_ArrayAllocationBase.h @@ -97,7 +97,7 @@ public: if (maxNumElements < numAllocated) setAllocatedSize (maxNumElements); } - + /** Swap the contents of two objects. */ void swapWith (ArrayAllocationBase & other) { diff --git a/src/native/linux/juce_linux_Network.cpp b/src/native/linux/juce_linux_Network.cpp index 8f0f3f0fe4..94b677a75f 100644 --- a/src/native/linux/juce_linux_Network.cpp +++ b/src/native/linux/juce_linux_Network.cpp @@ -261,7 +261,7 @@ public: if (select (socketHandle + 1, &readbits, 0, 0, &tv) <= 0) return 0; // (timeout) - const int bytesRead = jmax (0, recv (socketHandle, buffer, bytesToRead, MSG_WAITALL)); + const int bytesRead = jmax (0, (int) recv (socketHandle, buffer, bytesToRead, MSG_WAITALL)); readPosition += bytesRead; return bytesRead; }