Merge pull request #155 from GaoGeolone/master

Sanic · web-flow · commit d903cc97ae61 · 2021-07-19T11:42:26.000+02:00
Version adaptive
diff --git a/Source/ROSIntegration/Classes/ROSIntegrationGameInstance.h b/Source/ROSIntegration/Classes/ROSIntegrationGameInstance.h
@@ -49,7 +49,7 @@ class ROSINTEGRATION_API UROSIntegrationGameInstance : public UGameInstance
 protected:
 	void CheckROSBridgeHealth();
 
-#if ENGINE_MINOR_VERSION > 23
+#if ENGINE_MINOR_VERSION > 23 || ENGINE_MAJOR_VERSION >4
 	virtual void OnWorldTickStart(UWorld * World, ELevelTick TickType, float DeltaTime);
 #else 
 	virtual void OnWorldTickStart(ELevelTick TickType, float DeltaTime);
diff --git a/Source/ROSIntegration/Private/ROSIntegrationGameInstance.cpp b/Source/ROSIntegration/Private/ROSIntegrationGameInstance.cpp
@@ -192,7 +192,7 @@ void UROSIntegrationGameInstance::BeginDestroy()
 	UE_LOG(LogROS, Display, TEXT("ROS Game Instance - begin destroy - done"));
 }
 
-#if ENGINE_MINOR_VERSION > 23
+#if ENGINE_MINOR_VERSION > 23 || ENGINE_MAJOR_VERSION >4
 void UROSIntegrationGameInstance::OnWorldTickStart(UWorld * World, ELevelTick TickType, float DeltaTime)
 #else 
 void UROSIntegrationGameInstance::OnWorldTickStart(ELevelTick TickType, float DeltaTime)

Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,7 @@ void UROSIntegrationGameInstance::BeginDestroy()`
`192`	`192`	`UE_LOG(LogROS, Display, TEXT("ROS Game Instance - begin destroy - done"));`
`193`	`193`	`}`
`194`	`194`
`195`		`-#if ENGINE_MINOR_VERSION > 23`
	`195`	`+#if ENGINE_MINOR_VERSION > 23 \|\| ENGINE_MAJOR_VERSION >4`
`196`	`196`	`void UROSIntegrationGameInstance::OnWorldTickStart(UWorld * World, ELevelTick TickType, float DeltaTime)`
`197`	`197`	`#else`
`198`	`198`	`void UROSIntegrationGameInstance::OnWorldTickStart(ELevelTick TickType, float DeltaTime)`