From e449f1a8af7d39d2e4bf06649324e9836ea7f00c Mon Sep 17 00:00:00 2001
From: jules <jules@rawmaterialsoftware.com>
Date: Sat, 29 Mar 2014 13:56:16 +0000
Subject: [PATCH] Workarounds for a couple of MSVC quirks.

---
 modules/juce_core/network/juce_URL.h          |  1 +
 .../opengl/juce_OpenGLGraphicsContext.cpp     | 44 +++++++++----------
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/modules/juce_core/network/juce_URL.h b/modules/juce_core/network/juce_URL.h
index 85b3657414..4f511d870b 100644
--- a/modules/juce_core/network/juce_URL.h
+++ b/modules/juce_core/network/juce_URL.h
@@ -360,6 +360,7 @@ private:
         JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (Upload)
     };
 
+    friend struct ContainerDeletePolicy<Upload>;
     ReferenceCountedArray<Upload> filesToUpload;
 
     URL (const String&, int);
diff --git a/modules/juce_opengl/opengl/juce_OpenGLGraphicsContext.cpp b/modules/juce_opengl/opengl/juce_OpenGLGraphicsContext.cpp
index 80361b0ea8..311dfa663a 100644
--- a/modules/juce_opengl/opengl/juce_OpenGLGraphicsContext.cpp
+++ b/modules/juce_opengl/opengl/juce_OpenGLGraphicsContext.cpp
@@ -85,28 +85,6 @@ struct CachedImageList  : public ReferenceCountedObject,
         return c->getTextureInfo();
     }
 
-    typedef ReferenceCountedObjectPtr<CachedImageList> Ptr;
-
-private:
-    void imageDataChanged (ImagePixelData* im) override
-    {
-        if (CachedImage* c = findCachedImage (im))
-            c->texture.release();
-    }
-
-    void imageDataBeingDeleted (ImagePixelData* im) override
-    {
-        for (int i = images.size(); --i >= 0;)
-        {
-            if (images.getUnchecked(i)->pixelData == im)
-            {
-                totalSize -= images.getUnchecked(i)->imageSize;
-                images.remove (i);
-                break;
-            }
-        }
-    }
-
     struct CachedImage
     {
         CachedImage (CachedImageList& list, ImagePixelData* im)
@@ -150,6 +128,28 @@ private:
         JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (CachedImage)
     };
 
+    typedef ReferenceCountedObjectPtr<CachedImageList> Ptr;
+
+private:
+    void imageDataChanged (ImagePixelData* im) override
+    {
+        if (CachedImage* c = findCachedImage (im))
+            c->texture.release();
+    }
+
+    void imageDataBeingDeleted (ImagePixelData* im) override
+    {
+        for (int i = images.size(); --i >= 0;)
+        {
+            if (images.getUnchecked(i)->pixelData == im)
+            {
+                totalSize -= images.getUnchecked(i)->imageSize;
+                images.remove (i);
+                break;
+            }
+        }
+    }
+
     OwnedArray<CachedImage> images;
     size_t totalSize, maxCacheSize;