From 89966b43ec321fc61017bade29c1a05dcafabe38 Mon Sep 17 00:00:00 2001
From: Julian Storer <jules@rawmaterialsoftware.com>
Date: Tue, 28 Sep 2010 10:11:20 +0100
Subject: [PATCH] Removed some win32 compiler warnings

---
 juce_amalgamated.h                       | 5 +----
 src/audio/dsp/juce_AudioDataConverters.h | 2 +-
 src/containers/juce_ScopedPointer.h      | 3 ---
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/juce_amalgamated.h b/juce_amalgamated.h
index cd01bde8fd..1414f2193c 100644
--- a/juce_amalgamated.h
+++ b/juce_amalgamated.h
@@ -6523,9 +6523,6 @@ public:
 	/** Returns a reference to the address of the object that this ScopedPointer refers to. */
 	inline ObjectType* const* operator&() const throw()				 { return static_cast <ObjectType* const*> (&object); }
 
-	/** Returns a reference to the address of the object that this ScopedPointer refers to. */
-	inline ObjectType** operator&() throw()					 { return static_cast <ObjectType**> (&object); }
-
 	/** Removes the current object from this ScopedPointer without deleting it.
 
 		This will return the current object, and set the ScopedPointer to a null pointer.
@@ -30079,7 +30076,7 @@ public:
 	template <class SampleFormatType> inline void advanceData (SampleFormatType& s) throw()			 { s.skip (numInterleavedChannels); }
 	template <class SampleFormatType> inline void advanceDataBy (SampleFormatType& s, int numSamples) throw()   { s.skip (numInterleavedChannels * numSamples); }
 	template <class SampleFormatType> inline void clear (SampleFormatType& s, int numSamples) throw()	   { while (--numSamples >= 0) { s.clear(); s.skip (numInterleavedChannels); } }
-	template <class SampleFormatType> inline int getNumBytesBetweenSamples (const SampleFormatType& s) const throw()  { return numInterleavedChannels * s.bytesPerSample; }
+	template <class SampleFormatType> inline int getNumBytesBetweenSamples (const SampleFormatType&) const throw()  { return numInterleavedChannels * SampleFormatType::bytesPerSample; }
 	int numInterleavedChannels;
 	enum { isInterleavedType = 1 };
 };
diff --git a/src/audio/dsp/juce_AudioDataConverters.h b/src/audio/dsp/juce_AudioDataConverters.h
index 806b7508c7..9d631d97ac 100644
--- a/src/audio/dsp/juce_AudioDataConverters.h
+++ b/src/audio/dsp/juce_AudioDataConverters.h
@@ -549,7 +549,7 @@ public:
     template <class SampleFormatType> inline void advanceData (SampleFormatType& s) throw()                     { s.skip (numInterleavedChannels); }
     template <class SampleFormatType> inline void advanceDataBy (SampleFormatType& s, int numSamples) throw()   { s.skip (numInterleavedChannels * numSamples); }
     template <class SampleFormatType> inline void clear (SampleFormatType& s, int numSamples) throw()           { while (--numSamples >= 0) { s.clear(); s.skip (numInterleavedChannels); } }
-    template <class SampleFormatType> inline int getNumBytesBetweenSamples (const SampleFormatType& s) const throw()  { return numInterleavedChannels * s.bytesPerSample; }
+    template <class SampleFormatType> inline int getNumBytesBetweenSamples (const SampleFormatType&) const throw()  { return numInterleavedChannels * SampleFormatType::bytesPerSample; }
     int numInterleavedChannels;
     enum { isInterleavedType = 1 };
 };
diff --git a/src/containers/juce_ScopedPointer.h b/src/containers/juce_ScopedPointer.h
index 642c10e2cb..8e3468e313 100644
--- a/src/containers/juce_ScopedPointer.h
+++ b/src/containers/juce_ScopedPointer.h
@@ -142,9 +142,6 @@ public:
     /** Returns a reference to the address of the object that this ScopedPointer refers to. */
     inline ObjectType* const* operator&() const throw()                             { return static_cast <ObjectType* const*> (&object); }
 
-    /** Returns a reference to the address of the object that this ScopedPointer refers to. */
-    inline ObjectType** operator&() throw()                                         { return static_cast <ObjectType**> (&object); }
-
     //==============================================================================
     /** Removes the current object from this ScopedPointer without deleting it.