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

Workarounds for some c++11 compiler warnings.

Browse source
This commit is contained in:
jules 2012-06-23 10:25:16 +01:00
parent 0194486115
commit 1cf1cd1a3b
3 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

18
modules/juce_core/maths/juce_Expression.cpp
View file

@ -44,7 +44,7 @@ public:
double /*overallTarget*/, Term* /*topLevelTerm*/) const
{
jassertfalse;
return nullptr;
return ReferenceCountedObjectPtr<Term>();
}
virtual String getName() const
@ -184,7 +184,7 @@ struct Expression::Helpers
{
jassert (input == left || input == right);
if (input != left && input != right)
return nullptr;
return TermPtr();
const Term* const dest = findDestinationFor (topLevelTerm, this);
@ -464,7 +464,7 @@ struct Expression::Helpers
{
const TermPtr newDest (createDestinationTerm (scope, input, overallTarget, topLevelTerm));
if (newDest == nullptr)
return nullptr;
return TermPtr();
return new Subtract (newDest, (input == left ? right : left)->clone());
}
@ -489,7 +489,7 @@ struct Expression::Helpers
{
const TermPtr newDest (createDestinationTerm (scope, input, overallTarget, topLevelTerm));
if (newDest == nullptr)
return nullptr;
return TermPtr();
if (input == left)
return new Add (newDest, right->clone());
@ -517,7 +517,7 @@ struct Expression::Helpers
{
const TermPtr newDest (createDestinationTerm (scope, input, overallTarget, topLevelTerm));
if (newDest == nullptr)
return nullptr;
return TermPtr();
return new Divide (newDest, (input == left ? right : left)->clone());
}
@ -542,7 +542,7 @@ struct Expression::Helpers
{
const TermPtr newDest (createDestinationTerm (scope, input, overallTarget, topLevelTerm));
if (newDest == nullptr)
return nullptr;
return TermPtr();
if (input == left)
return new Multiply (newDest, right->clone());
@ -897,17 +897,17 @@ struct Expression::Helpers
}
}
return nullptr;
return TermPtr();
}
TermPtr readParenthesisedExpression()
{
if (! readOperator ("("))
return nullptr;
return TermPtr();
const TermPtr e (readExpression());
if (e == nullptr || ! readOperator (")"))
return nullptr;
return TermPtr();
return e;
}

2
modules/juce_graphics/native/juce_RenderingHelpers.h
View file

@ -1614,7 +1614,7 @@ namespace ClipRegions
}
if (transform.isSingularity())
return nullptr;
return Ptr();
{
Path p;

8
modules/juce_opengl/opengl/juce_OpenGLGraphicsContext.cpp
View file

@ -1432,7 +1432,7 @@ public:
{
clip = clip.getIntersection (r.getBounds());
if (clip.isEmpty())
return nullptr;
return Ptr();
RectangleList excluded (clip);
@ -1455,7 +1455,7 @@ public:
Ptr excludeClipRectangle (const Rectangle<int>& r)
{
if (r.contains (clip))
return nullptr;
return Ptr();
TargetSaver ts (state.target.context);
makeActive();
@ -1482,7 +1482,7 @@ public:
return clipToTexture (pt);
}
return nullptr;
return Ptr();
}
Ptr clipToTexture (const PositionedTexture& pt)
@ -1490,7 +1490,7 @@ public:
clip = clip.getIntersection (pt.clip);
if (clip.isEmpty())
return nullptr;
return Ptr();
TargetSaver ts (state.target.context);
makeActive();