From 1cf1cd1a3b347317ff98e2d9f707250e40ed0c63 Mon Sep 17 00:00:00 2001
From: jules <jules@rawmaterialsoftware.com>
Date: Sat, 23 Jun 2012 10:25:16 +0100
Subject: [PATCH] Workarounds for some c++11 compiler warnings.

---
 modules/juce_core/maths/juce_Expression.cpp    | 18 +++++++++---------
 .../native/juce_RenderingHelpers.h             |  2 +-
 .../opengl/juce_OpenGLGraphicsContext.cpp      |  8 ++++----
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/modules/juce_core/maths/juce_Expression.cpp b/modules/juce_core/maths/juce_Expression.cpp
index aaff3c7a54..b8a1dcf9f3 100644
--- a/modules/juce_core/maths/juce_Expression.cpp
+++ b/modules/juce_core/maths/juce_Expression.cpp
@@ -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;
         }
diff --git a/modules/juce_graphics/native/juce_RenderingHelpers.h b/modules/juce_graphics/native/juce_RenderingHelpers.h
index c22200907e..224c2039d4 100644
--- a/modules/juce_graphics/native/juce_RenderingHelpers.h
+++ b/modules/juce_graphics/native/juce_RenderingHelpers.h
@@ -1614,7 +1614,7 @@ namespace ClipRegions
             }
 
             if (transform.isSingularity())
-                return nullptr;
+                return Ptr();
 
             {
                 Path p;
diff --git a/modules/juce_opengl/opengl/juce_OpenGLGraphicsContext.cpp b/modules/juce_opengl/opengl/juce_OpenGLGraphicsContext.cpp
index d9a9f860a4..6bbd566f95 100644
--- a/modules/juce_opengl/opengl/juce_OpenGLGraphicsContext.cpp
+++ b/modules/juce_opengl/opengl/juce_OpenGLGraphicsContext.cpp
@@ -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();