mirror of
https://github.com/juce-framework/JUCE.git
synced 2026-01-16 00:34:19 +00:00
Added fake placeholder versions of the new c++0x 'noexcept' and 'nullptr' keywords, and altered the library classes to use these instead of 'throw()' and '0'. This shouldn't make any difference at all to existing code, but will enable better static checking with future c++0x compilers.
This commit is contained in:
parent
e0a38a30db
commit
f04309f44a
533 changed files with 13927 additions and 13931 deletions
|
|
@ -260,7 +260,7 @@ public:
|
|||
}
|
||||
|
||||
SavedState* const top = stateStack.getLast();
|
||||
currentState->clipToImage (top != 0 ? top->canvas.get() : originalCanvas,
|
||||
currentState->clipToImage (top != nullptr ? top->canvas.get() : originalCanvas,
|
||||
temporaryCanvas, temporaryLayerBitmap, maskImage,
|
||||
bounds.getX(), bounds.getY());
|
||||
}
|
||||
|
|
@ -715,7 +715,7 @@ private:
|
|||
ScopedPointer <SavedState> currentState;
|
||||
OwnedArray <SavedState> stateStack;
|
||||
|
||||
GlobalRef& getCanvas() const throw() { return currentState->canvas; }
|
||||
GlobalRef& getCanvas() const noexcept { return currentState->canvas; }
|
||||
|
||||
jobject getCurrentPaint() const { return currentState->getPaint(); }
|
||||
jobject getImagePaint() const { return currentState->getImagePaint(); }
|
||||
|
|
@ -775,13 +775,13 @@ private:
|
|||
return LocalRef<jobject> (region);
|
||||
}
|
||||
|
||||
static int colourToInt (const Colour& col) throw()
|
||||
static int colourToInt (const Colour& col) noexcept
|
||||
{
|
||||
return col.getARGB();
|
||||
}
|
||||
|
||||
template <class PixelType>
|
||||
static void copyPixels (jint* const dest, const PixelType* src, const int width, const int pixelStride) throw()
|
||||
static void copyPixels (jint* const dest, const PixelType* src, const int width, const int pixelStride) noexcept
|
||||
{
|
||||
for (int x = 0; x < width; ++x)
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue