Fixed iOS duplicated function names with Fyber Unity plugin

jkasten2 · jkasten2 · commit 19e602a1042d · 2017-01-27T13:24:37.000-08:00
diff --git a/Unity4.7OneSignalExample/Assets/OneSignal/src/OneSignalIOS.cs b/Unity4.7OneSignalExample/Assets/OneSignal/src/OneSignalIOS.cs
@@ -70,7 +70,7 @@ public class OneSignalIOS : OneSignalPlatform {
     extern static public void _promptLocation();
 
     [System.Runtime.InteropServices.DllImport("__Internal")]
-	extern static public void _setLogLevel(int logLevel, int visualLogLevel);
+	extern static public void _setOneSignalLogLevel(int logLevel, int visualLogLevel);
 
 
 	public OneSignalIOS(string gameObjectName, string appId, bool autoPrompt, bool inAppLaunchURLs, OneSignal.OSInFocusDisplayOption displayOption, OneSignal.LOG_LEVEL logLevel, OneSignal.LOG_LEVEL visualLevel) {
diff --git a/Unity4.7OneSignalExample/Assets/Plugins/iOS/OneSignalUnityRuntime.m b/Unity4.7OneSignalExample/Assets/Plugins/iOS/OneSignalUnityRuntime.m
@@ -223,7 +223,7 @@ void _promptLocation() {
     [OneSignal promptLocation];
 }
 
-void _setLogLevel(int logLevel, int visualLogLevel) {
+void _setOneSignalLogLevel(int logLevel, int visualLogLevel) {
     [OneSignal setLogLevel:logLevel visualLevel: visualLogLevel];
 }
 
diff --git a/Unity5OneSignalExample/Assets/OneSignal/Platforms/iOS/OneSignalUnityRuntime.m b/Unity5OneSignalExample/Assets/OneSignal/Platforms/iOS/OneSignalUnityRuntime.m
@@ -223,7 +223,7 @@ void _promptLocation() {
     [OneSignal promptLocation];
 }
 
-void _setLogLevel(int logLevel, int visualLogLevel) {
+void _setOneSignalLogLevel(int logLevel, int visualLogLevel) {
     [OneSignal setLogLevel:logLevel visualLevel: visualLogLevel];
 }
 
diff --git a/Unity5OneSignalExample/Assets/OneSignal/src/OneSignalIOS.cs b/Unity5OneSignalExample/Assets/OneSignal/src/OneSignalIOS.cs
@@ -70,7 +70,7 @@ public class OneSignalIOS : OneSignalPlatform {
     extern static public void _promptLocation();
 
     [System.Runtime.InteropServices.DllImport("__Internal")]
-	extern static public void _setLogLevel(int logLevel, int visualLogLevel);
+	extern static public void _setOneSignalLogLevel(int logLevel, int visualLogLevel);
 
 
 	public OneSignalIOS(string gameObjectName, string appId, bool autoPrompt, bool inAppLaunchURLs, OneSignal.OSInFocusDisplayOption displayOption, OneSignal.LOG_LEVEL logLevel, OneSignal.LOG_LEVEL visualLevel) {

Original file line number	Diff line number	Diff line change
`@@ -223,7 +223,7 @@ void _promptLocation() {`
`223`	`223`	`[OneSignal promptLocation];`
`224`	`224`	`}`
`225`	`225`
`226`		`-void _setLogLevel(int logLevel, int visualLogLevel) {`
	`226`	`+void _setOneSignalLogLevel(int logLevel, int visualLogLevel) {`
`227`	`227`	`[OneSignal setLogLevel:logLevel visualLevel: visualLogLevel];`
`228`	`228`	`}`
`229`	`229`