unreal engine 5 changes

- Only compile tested on win64 for now
tamaynard · May 26, 2021 · c96cd41 · c96cd41
1 parent d424256
commit c96cd41
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 16 deletions.
diff --git a/SocketIOClient.uplugin b/SocketIOClient.uplugin
@@ -1,8 +1,8 @@
 {
 	"FileVersion": 3,
 	"Version": 1,
-	"VersionName": "1.6.0",
-	"EngineVersion" : "4.26.0",
+	"VersionName": "1.7.0",
+	"EngineVersion" : "5.0.0",
 	"FriendlyName": "Socket.IO Client",
 	"Description": "Real-time networking library Socket.IO Client usable from blueprints and c++.",
 	"Category": "Networking",

diff --git a/Source/CoreUtility/Private/CUBlueprintLibrary.cpp b/Source/CoreUtility/Private/CUBlueprintLibrary.cpp
@@ -295,11 +295,7 @@ void UCUBlueprintLibrary::SetSoundWaveFromWavBytes(USoundWaveProcedural* InSound
 TFuture<UTexture2D*> UCUBlueprintLibrary::Conv_BytesToTexture_Async(const TArray<uint8>& InBytes)
 {
 	//Running this on a background thread
-#if ENGINE_MINOR_VERSION < 23
-	return Async<UTexture2D*>(EAsyncExecution::Thread,[InBytes]
-#else
 	return Async(EAsyncExecution::Thread, [InBytes]
-#endif
 	{
 		//Create wrapper pointer we can share easily across threads
 		struct FDataHolder

diff --git a/Source/SIOJEditorPlugin/Private/SIOJ_BreakJson.cpp b/Source/SIOJEditorPlugin/Private/SIOJ_BreakJson.cpp
@@ -69,11 +69,8 @@ class FKCHandler_BreakJson : public FNodeHandlingFunctor
 
 				FBPTerminal* FieldNameTerm = Context.CreateLocalTerminal(ETerminalSpecification::TS_Literal);
 				FieldNameTerm->Type.PinCategory = CompilerContext.GetSchema()->PC_String;
-#if ENGINE_MINOR_VERSION >= 13
 				FieldNameTerm->SourcePin = Pin;
-#else
-				FieldNameTerm->Source = Pin;
-#endif
+				//FieldNameTerm->Source = Pin;
 				FieldNameTerm->Name = FieldName.ToString();
 				FieldNameTerm->TextLiteral = FText::FromName(FieldName);
 

diff --git a/Source/SIOJson/Private/SIOJsonObject.cpp b/Source/SIOJson/Private/SIOJsonObject.cpp
@@ -68,10 +68,10 @@ FString USIOJsonObject::EncodeJsonToSingleString() const
 	FString OutputString = EncodeJson();
 
 	// Remove line terminators
-	OutputString.Replace(LINE_TERMINATOR, TEXT(""));
+	(void)OutputString.Replace(LINE_TERMINATOR, TEXT(""));
 
 	// Remove tabs
-	OutputString.Replace(LINE_TERMINATOR, TEXT("\t"));
+	(void)OutputString.Replace(LINE_TERMINATOR, TEXT("\t"));
 
 	return OutputString;
 }

diff --git a/Source/SocketIOClient/SocketIOClient.Build.cs b/Source/SocketIOClient/SocketIOClient.Build.cs
@@ -27,7 +27,7 @@ public bool LoadLib(ReadOnlyTargetRules Target)
         {
             bool isLibrarySupported = false;
 
-            if ((Target.Platform == UnrealTargetPlatform.Win64) || (Target.Platform == UnrealTargetPlatform.Win32))
+            if (Target.Platform == UnrealTargetPlatform.Win64)
             {
                 isLibrarySupported = true;
             }

diff --git a/Source/SocketIOLib/Private/internal/sio_client_impl.h b/Source/SocketIOLib/Private/internal/sio_client_impl.h
@@ -3,6 +3,10 @@
 #ifndef SIO_CLIENT_IMPL_H
 #define SIO_CLIENT_IMPL_H
 
+#ifndef SIO_TLS
+#define SIO_TLS 0
+#endif
+
 /* This disables two things:
    1) error 4503 where MSVC complains about
 	  decorated names being too long. There's no way around
@@ -43,7 +47,7 @@
 	typedef websocketpp::config::debug_asio client_config;
   #endif //SIO_TLS
 #else
-  #if defined(SIO_TLS)
+  #if SIO_TLS
 	#include <websocketpp/config/asio_client.hpp>
 	typedef websocketpp::config::asio_tls_client client_config;
   #else
@@ -220,7 +224,6 @@
             std::string m_sid;
             std::string m_base_url;
             std::string m_query_string;
-            std::string m_path;
             std::map<std::string, std::string> m_http_headers;
 
             unsigned int m_ping_interval;
@@ -257,6 +260,8 @@
 
             unsigned m_reconn_made;
 
+            std::string m_path;
+
             friend class sio::client;
             friend class sio::socket;
         };

diff --git a/Source/SocketIOLib/Private/sio_socket.cpp b/Source/SocketIOLib/Private/sio_socket.cpp
@@ -31,7 +31,11 @@
 #include <cstdarg>
 #include <functional>
 
-#if DEBUG || _DEBUG
+#ifndef DEBUG
+#define DEBUG 0
+#endif
+
+#if DEBUG
 #define LOG(x) std::cout << x
 #else
 #define LOG(x)