[cpp-ue4] Support UE5 version of FTickerObjectBase (#13304)

Co-authored-by: nullbus <nullbus@nm-fc.com>
OpenAPITools · Aug 29, 2022 · 9b9d320 · 9b9d320
1 parent 97b3859
commit 9b9d320
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/modules/openapi-generator/src/main/resources/cpp-ue4/model-base-header.mustache b/modules/openapi-generator/src/main/resources/cpp-ue4/model-base-header.mustache
@@ -7,6 +7,7 @@
 #include "Dom/JsonObject.h"
 #include "HttpRetrySystem.h"
 #include "Containers/Ticker.h"
+#include "Runtime/Launch/Resources/Version.h"
 
 {{#cppNamespaceDeclarations}}
 namespace {{this}}
@@ -16,7 +17,13 @@ namespace {{this}}
 typedef TSharedRef<TJsonWriter<>> JsonWriter;
 using namespace FHttpRetrySystem;
 
-struct {{dllapi}} HttpRetryManager : public FManager, public FTickerObjectBase
+struct {{dllapi}} HttpRetryManager
+	: public FManager
+#if ENGINE_MAJOR_VERSION <= 4
+	, public FTickerObjectBase
+#else
+	, public FTSTickerObjectBase
+#endif
 {
 	using FManager::FManager;
 

diff --git a/samples/client/petstore/cpp-ue4/Public/OpenAPIBaseModel.h b/samples/client/petstore/cpp-ue4/Public/OpenAPIBaseModel.h
@@ -18,14 +18,21 @@
 #include "Dom/JsonObject.h"
 #include "HttpRetrySystem.h"
 #include "Containers/Ticker.h"
+#include "Runtime/Launch/Resources/Version.h"
 
 namespace OpenAPI
 {
 
 typedef TSharedRef<TJsonWriter<>> JsonWriter;
 using namespace FHttpRetrySystem;
 
-struct OPENAPI_API HttpRetryManager : public FManager, public FTickerObjectBase
+struct OPENAPI_API HttpRetryManager
+	: public FManager
+#if ENGINE_MAJOR_VERSION <= 4
+	, public FTickerObjectBase
+#else
+	, public FTSTickerObjectBase
+#endif
 {
 	using FManager::FManager;