From 0938a42440cc82ce8d0cb064840c258c863714ab Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Fri, 30 Sep 2011 17:55:14 +0000
Subject: fixes for 98% of all the warnings/errors reported by OS X gcc on
 tiger

git-svn-id: svn://localhost/ardour2/branches/3.0@10179 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 libs/appleutility/CAAudioChannelLayout.h |  2 +-
 libs/appleutility/CAAudioUnit.cpp        | 16 ++++++++--------
 libs/appleutility/CAReferenceCounted.h   |  6 +++---
 3 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'libs/appleutility')

diff --git a/libs/appleutility/CAAudioChannelLayout.h b/libs/appleutility/CAAudioChannelLayout.h
index 796f197c3b..5c351c29b5 100644
--- a/libs/appleutility/CAAudioChannelLayout.h
+++ b/libs/appleutility/CAAudioChannelLayout.h
@@ -150,7 +150,7 @@ private:
 	
 	private:
 		ACLRefCounter () : mLayout(NULL) { }
-		ACLRefCounter(const ACLRefCounter&) : mLayout(NULL) { }
+		ACLRefCounter(const ACLRefCounter& other) : CAReferenceCounted (other), mLayout(NULL) { }
 		ACLRefCounter& operator=(const ACLRefCounter&) { return *this; }
 	};
 	
diff --git a/libs/appleutility/CAAudioUnit.cpp b/libs/appleutility/CAAudioUnit.cpp
index aaf57f233d..131969b66c 100644
--- a/libs/appleutility/CAAudioUnit.cpp
+++ b/libs/appleutility/CAAudioUnit.cpp
@@ -191,7 +191,7 @@ private:
 private:
 		// get the compiler to tell us when we do a bad thing!!!
 	AUState () {}
-	AUState (const AUState&) {}
+        AUState (const AUState& other) : CAReferenceCounted (other) {}
 	AUState& operator= (const AUState&) { return *this; } 
 };						
 						
@@ -1084,13 +1084,13 @@ bool		CAAudioUnit::HasCustomView () const
 OSStatus		CAAudioUnit::GetParameter(AudioUnitParameterID inID, AudioUnitScope scope, AudioUnitElement element,
 											Float32 &outValue) const
 {
-	return mDataPtr ? mDataPtr->GetParameter (inID, scope, element, outValue) : paramErr;
+	return mDataPtr ? (OSStatus) mDataPtr->GetParameter (inID, scope, element, outValue) : paramErr;
 }
 
 OSStatus		CAAudioUnit::SetParameter(AudioUnitParameterID inID, AudioUnitScope scope, AudioUnitElement element,
 											Float32 value, UInt32 bufferOffsetFrames)
 {
-	return mDataPtr ? mDataPtr->SetParameter (inID, scope, element, value, bufferOffsetFrames) : paramErr;
+	return mDataPtr ? (OSStatus) mDataPtr->SetParameter (inID, scope, element, value, bufferOffsetFrames) : paramErr;
 }
 
 OSStatus		CAAudioUnit::MIDIEvent (UInt32			inStatus,
@@ -1098,7 +1098,7 @@ OSStatus		CAAudioUnit::MIDIEvent (UInt32			inStatus,
 								UInt32					inData2,
 								UInt32					inOffsetSampleFrame)
 {
-	return mDataPtr ? mDataPtr->MIDIEvent (inStatus, inData1, inData2, inOffsetSampleFrame) : paramErr;
+	return mDataPtr ? (OSStatus) mDataPtr->MIDIEvent (inStatus, inData1, inData2, inOffsetSampleFrame) : paramErr;
 }
 
 OSStatus	CAAudioUnit::StartNote (MusicDeviceInstrumentID		inInstrument,
@@ -1107,15 +1107,15 @@ OSStatus	CAAudioUnit::StartNote (MusicDeviceInstrumentID		inInstrument,
 									UInt32						inOffsetSampleFrame,
 									const MusicDeviceNoteParams * inParams)
 {
-	return mDataPtr ? mDataPtr->StartNote (inInstrument, inGroupID, outNoteInstanceID, inOffsetSampleFrame, inParams) 
-					: paramErr;
+	return mDataPtr ? (OSStatus) mDataPtr->StartNote (inInstrument, inGroupID, outNoteInstanceID, inOffsetSampleFrame, inParams) 
+		: paramErr;
 }
 
 OSStatus	CAAudioUnit::StopNote (MusicDeviceGroupID		inGroupID,
 									NoteInstanceID				inNoteInstanceID,
 									UInt32						inOffsetSampleFrame)
 {
-	return mDataPtr ? mDataPtr->StopNote (inGroupID, inNoteInstanceID, inOffsetSampleFrame) : paramErr;
+	return mDataPtr ? (OSStatus) mDataPtr->StopNote (inGroupID, inNoteInstanceID, inOffsetSampleFrame) : paramErr;
 }
 
 #pragma mark __Render
@@ -1126,7 +1126,7 @@ OSStatus		CAAudioUnit::Render (AudioUnitRenderActionFlags 			* ioActionFlags,
 												UInt32						inNumberFrames,
 												AudioBufferList				* ioData)
 {
-	return mDataPtr ? mDataPtr->Render (ioActionFlags, inTimeStamp, inOutputBusNumber, inNumberFrames, ioData) : paramErr;
+	return mDataPtr ? (OSStatus) mDataPtr->Render (ioActionFlags, inTimeStamp, inOutputBusNumber, inNumberFrames, ioData) : paramErr;
 }
 
 static AURenderCallbackStruct sRenderCallback;
diff --git a/libs/appleutility/CAReferenceCounted.h b/libs/appleutility/CAReferenceCounted.h
index fc18dc8ca4..a9c8dccca3 100644
--- a/libs/appleutility/CAReferenceCounted.h
+++ b/libs/appleutility/CAReferenceCounted.h
@@ -70,12 +70,12 @@ public:
 			}
 
 protected:
-    virtual	~CAReferenceCounted() { }
-	
+	virtual	~CAReferenceCounted() { }
+	CAReferenceCounted(const CAReferenceCounted &) : mRefCount(0) { }
+
 private:
 	SInt32		mRefCount;
 
-	CAReferenceCounted(const CAReferenceCounted &) : mRefCount(0) { }
 	CAReferenceCounted operator=(const CAReferenceCounted &) { return *this; }
 };
 
-- 
cgit v1.2.3