fix -fpermissive error/warning on gcc/clang

PoroCYon · yupferris · commit a5a90218b190 · 2020-08-31T11:51:40.000+02:00
diff --git a/WaveSabreCore/include/WaveSabreCore/Adultery.h b/WaveSabreCore/include/WaveSabreCore/Adultery.h
@@ -65,7 +65,7 @@ namespace WaveSabreCore
 		{
 		public:
 			AdulteryVoice(Adultery *adultery);
-			virtual WaveSabreCore::SynthDevice *SynthDevice() const;
+			virtual WaveSabreCore::SynthDevice *GetSynthDevice() const;
 
 			virtual void Run(double songPosition, float **outputs, int numSamples);
 
diff --git a/WaveSabreCore/include/WaveSabreCore/Falcon.h b/WaveSabreCore/include/WaveSabreCore/Falcon.h
@@ -66,7 +66,7 @@ namespace WaveSabreCore
 		{
 		public:
 			FalconVoice(Falcon *falcon);
-			virtual WaveSabreCore::SynthDevice *SynthDevice() const;
+			virtual WaveSabreCore::SynthDevice *GetSynthDevice() const;
 
 			virtual void Run(double songPosition, float **outputs, int numSamples);
 
diff --git a/WaveSabreCore/include/WaveSabreCore/Slaughter.h b/WaveSabreCore/include/WaveSabreCore/Slaughter.h
@@ -80,7 +80,7 @@ namespace WaveSabreCore
 		{
 		public:
 			SlaughterVoice(Slaughter *slaughter);
-			virtual WaveSabreCore::SynthDevice *SynthDevice() const;
+			virtual WaveSabreCore::SynthDevice *GetSynthDevice() const;
 
 			virtual void Run(double songPosition, float **outputs, int numSamples);
 
diff --git a/WaveSabreCore/include/WaveSabreCore/Specimen.h b/WaveSabreCore/include/WaveSabreCore/Specimen.h
@@ -77,7 +77,7 @@ namespace WaveSabreCore
 		{
 		public:
 			SpecimenVoice(Specimen *thunder);
-			virtual WaveSabreCore::SynthDevice *SynthDevice() const;
+			virtual WaveSabreCore::SynthDevice *GetSynthDevice() const;
 
 			virtual void Run(double songPosition, float **outputs, int numSamples);
 
diff --git a/WaveSabreCore/include/WaveSabreCore/SynthDevice.h b/WaveSabreCore/include/WaveSabreCore/SynthDevice.h
@@ -48,7 +48,7 @@ namespace WaveSabreCore
 			Voice();
 			virtual ~Voice();
 
-			virtual SynthDevice *SynthDevice() const = 0;
+			virtual SynthDevice *GetSynthDevice() const = 0;
 
 			virtual void Run(double songPosition, float **outputs, int numSamples) = 0;
 
diff --git a/WaveSabreCore/include/WaveSabreCore/Thunder.h b/WaveSabreCore/include/WaveSabreCore/Thunder.h
@@ -31,7 +31,7 @@ namespace WaveSabreCore
 		{
 		public:
 			ThunderVoice(Thunder *thunder);
-			virtual WaveSabreCore::SynthDevice *SynthDevice() const;
+			virtual WaveSabreCore::SynthDevice *GetSynthDevice() const;
 
 			virtual void Run(double songPosition, float **outputs, int numSamples);
 
diff --git a/WaveSabreCore/src/Adultery.cpp b/WaveSabreCore/src/Adultery.cpp
@@ -253,7 +253,7 @@ namespace WaveSabreCore
 		this->adultery = adultery;
 	}
 
-	SynthDevice *Adultery::AdulteryVoice::SynthDevice() const
+	SynthDevice *Adultery::AdulteryVoice::GetSynthDevice() const
 	{
 		return adultery;
 	}
diff --git a/WaveSabreCore/src/Falcon.cpp b/WaveSabreCore/src/Falcon.cpp
@@ -145,7 +145,7 @@ namespace WaveSabreCore
 		this->falcon = falcon;
 	}
 
-	SynthDevice *Falcon::FalconVoice::SynthDevice() const
+	SynthDevice *Falcon::FalconVoice::GetSynthDevice() const
 	{
 		return falcon;
 	}
diff --git a/WaveSabreCore/src/Slaughter.cpp b/WaveSabreCore/src/Slaughter.cpp
@@ -176,7 +176,7 @@ namespace WaveSabreCore
 		osc1.Integral = osc2.Integral = osc3.Integral = 0.0;
 	}
 
-	SynthDevice *Slaughter::SlaughterVoice::SynthDevice() const
+	SynthDevice *Slaughter::SlaughterVoice::GetSynthDevice() const
 	{
 		return slaughter;
 	}
diff --git a/WaveSabreCore/src/Specimen.cpp b/WaveSabreCore/src/Specimen.cpp
@@ -289,7 +289,7 @@ namespace WaveSabreCore
 		this->specimen = specimen;
 	}
 
-	SynthDevice *Specimen::SpecimenVoice::SynthDevice() const
+	SynthDevice *Specimen::SpecimenVoice::GetSynthDevice() const
 	{
 		return specimen;
 	}
diff --git a/WaveSabreCore/src/SynthDevice.cpp b/WaveSabreCore/src/SynthDevice.cpp
@@ -249,7 +249,7 @@ namespace WaveSabreCore
 		slideActive = true;
 		destinationNote = note;
 		
-		double slideTime = 10.f * Helpers::Pow(this->SynthDevice()->Slide,4.0);
+		double slideTime = 10.f * Helpers::Pow(this->GetSynthDevice()->Slide,4.0);
 		slideDelta = ((double)note - currentNote) / (Helpers::CurrentSampleRate * slideTime);
 		slideSamples = (int)(Helpers::CurrentSampleRate * slideTime);
 	}
diff --git a/WaveSabreCore/src/Thunder.cpp b/WaveSabreCore/src/Thunder.cpp
@@ -120,7 +120,7 @@ namespace WaveSabreCore
 		this->thunder = thunder;
 	}
 
-	SynthDevice *Thunder::ThunderVoice::SynthDevice() const
+	SynthDevice *Thunder::ThunderVoice::GetSynthDevice() const
 	{
 		return thunder;
 	}

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ namespace WaveSabreCore`
`65`	`65`	`{`
`66`	`66`	`public:`
`67`	`67`	`AdulteryVoice(Adultery *adultery);`
`68`		`- virtual WaveSabreCore::SynthDevice *SynthDevice() const;`
	`68`	`+ virtual WaveSabreCore::SynthDevice *GetSynthDevice() const;`
`69`	`69`
`70`	`70`	`virtual void Run(double songPosition, float **outputs, int numSamples);`
`71`	`71`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ namespace WaveSabreCore`
`66`	`66`	`{`
`67`	`67`	`public:`
`68`	`68`	`FalconVoice(Falcon *falcon);`
`69`		`- virtual WaveSabreCore::SynthDevice *SynthDevice() const;`
	`69`	`+ virtual WaveSabreCore::SynthDevice *GetSynthDevice() const;`
`70`	`70`
`71`	`71`	`virtual void Run(double songPosition, float **outputs, int numSamples);`
`72`	`72`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ namespace WaveSabreCore`
`80`	`80`	`{`
`81`	`81`	`public:`
`82`	`82`	`SlaughterVoice(Slaughter *slaughter);`
`83`		`- virtual WaveSabreCore::SynthDevice *SynthDevice() const;`
	`83`	`+ virtual WaveSabreCore::SynthDevice *GetSynthDevice() const;`
`84`	`84`
`85`	`85`	`virtual void Run(double songPosition, float **outputs, int numSamples);`
`86`	`86`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ namespace WaveSabreCore`
`77`	`77`	`{`
`78`	`78`	`public:`
`79`	`79`	`SpecimenVoice(Specimen *thunder);`
`80`		`- virtual WaveSabreCore::SynthDevice *SynthDevice() const;`
	`80`	`+ virtual WaveSabreCore::SynthDevice *GetSynthDevice() const;`
`81`	`81`
`82`	`82`	`virtual void Run(double songPosition, float **outputs, int numSamples);`
`83`	`83`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ namespace WaveSabreCore`
`31`	`31`	`{`
`32`	`32`	`public:`
`33`	`33`	`ThunderVoice(Thunder *thunder);`
`34`		`- virtual WaveSabreCore::SynthDevice *SynthDevice() const;`
	`34`	`+ virtual WaveSabreCore::SynthDevice *GetSynthDevice() const;`
`35`	`35`
`36`	`36`	`virtual void Run(double songPosition, float **outputs, int numSamples);`
`37`	`37`
Original file line number	Diff line number	Diff line change
`@@ -253,7 +253,7 @@ namespace WaveSabreCore`
`253`	`253`	`this->adultery = adultery;`
`254`	`254`	`}`
`255`	`255`
`256`		`- SynthDevice *Adultery::AdulteryVoice::SynthDevice() const`
	`256`	`+ SynthDevice *Adultery::AdulteryVoice::GetSynthDevice() const`
`257`	`257`	`{`
`258`	`258`	`return adultery;`
`259`	`259`	`}`
Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ namespace WaveSabreCore`
`145`	`145`	`this->falcon = falcon;`
`146`	`146`	`}`
`147`	`147`
`148`		`- SynthDevice *Falcon::FalconVoice::SynthDevice() const`
	`148`	`+ SynthDevice *Falcon::FalconVoice::GetSynthDevice() const`
`149`	`149`	`{`
`150`	`150`	`return falcon;`
`151`	`151`	`}`
Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ namespace WaveSabreCore`
`176`	`176`	`osc1.Integral = osc2.Integral = osc3.Integral = 0.0;`
`177`	`177`	`}`
`178`	`178`
`179`		`- SynthDevice *Slaughter::SlaughterVoice::SynthDevice() const`
	`179`	`+ SynthDevice *Slaughter::SlaughterVoice::GetSynthDevice() const`
`180`	`180`	`{`
`181`	`181`	`return slaughter;`
`182`	`182`	`}`
Original file line number	Diff line number	Diff line change
`@@ -289,7 +289,7 @@ namespace WaveSabreCore`
`289`	`289`	`this->specimen = specimen;`
`290`	`290`	`}`
`291`	`291`
`292`		`- SynthDevice *Specimen::SpecimenVoice::SynthDevice() const`
	`292`	`+ SynthDevice *Specimen::SpecimenVoice::GetSynthDevice() const`
`293`	`293`	`{`
`294`	`294`	`return specimen;`
`295`	`295`	`}`