From 24b6d28bed5f24f54e5bb7791c5cca34494845fd Mon Sep 17 00:00:00 2001
From: Giovanni Vindiola <gvindol@ucsd.edu>
Date: Tue, 21 Nov 2023 18:52:53 -0800
Subject: [PATCH] Syntax fixes for Plugins when compiling for Linux
---
.../Source/CyberArchWarehouse/Public/LocusDBReader.h | 2 +-
.../Source/MqttUtilities/Private/Linux/Utils/StringUtils.cpp | 3 ++-
.../WebBrowserUI/Private/CEF/CEFWebInterfaceBrowserWindow.cpp | 4 ++--
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/Plugins/CyberArchWarehouse/Source/CyberArchWarehouse/Public/LocusDBReader.h b/Plugins/CyberArchWarehouse/Source/CyberArchWarehouse/Public/LocusDBReader.h
index 11124f6..9002a72 100644
--- a/Plugins/CyberArchWarehouse/Source/CyberArchWarehouse/Public/LocusDBReader.h
+++ b/Plugins/CyberArchWarehouse/Source/CyberArchWarehouse/Public/LocusDBReader.h
@@ -5,7 +5,7 @@
#include "Launch/Resources/Version.h"
#include "Interfaces/IHttpRequest.h"
#include "Interfaces/IHttpResponse.h"
-#include "HTTPManager.h"
+#include "HttpManager.h"
#include "HttpModule.h"
#include "Json.h"
#include "JsonUtilities.h"
diff --git a/Plugins/MqttUtilities/Source/MqttUtilities/Private/Linux/Utils/StringUtils.cpp b/Plugins/MqttUtilities/Source/MqttUtilities/Private/Linux/Utils/StringUtils.cpp
index c76ce75..c88ee2e 100644
--- a/Plugins/MqttUtilities/Source/MqttUtilities/Private/Linux/Utils/StringUtils.cpp
+++ b/Plugins/MqttUtilities/Source/MqttUtilities/Private/Linux/Utils/StringUtils.cpp
@@ -4,7 +4,8 @@
char* StringUtils::CopyString(FString str)
{
- const char* originalStr = TCHAR_TO_ANSI(*str);
+ const char* originalStr;
+ originalStr = TCHAR_TO_ANSI(*str);
char *copyStr;
size_t str_len;
diff --git a/Plugins/WebUI/Source/WebBrowserUI/Private/CEF/CEFWebInterfaceBrowserWindow.cpp b/Plugins/WebUI/Source/WebBrowserUI/Private/CEF/CEFWebInterfaceBrowserWindow.cpp
index e841a7f..357dc1e 100644
--- a/Plugins/WebUI/Source/WebBrowserUI/Private/CEF/CEFWebInterfaceBrowserWindow.cpp
+++ b/Plugins/WebUI/Source/WebBrowserUI/Private/CEF/CEFWebInterfaceBrowserWindow.cpp
@@ -2402,7 +2402,7 @@ void FCEFWebInterfaceBrowserWindow::HandleOnResourceLoadComplete(const CefString
ResourceLoadCompleteDelegate.ExecuteIfBound(WCHAR_TO_TCHAR(URL.ToWString().c_str()), _ResourceTypeToString(Type), _URLRequestStatusToString(Status), ContentLength);
}
-EWebInterfaceBrowserConsoleLogSeverity CefLogSeverityToWebBrowser(cef_log_severity_t Level)
+EWebInterfaceBrowserConsoleLogSeverity CefLogSeverityToWebBrowserWebUI(cef_log_severity_t Level)
{
switch (Level)
{
@@ -2426,7 +2426,7 @@ EWebInterfaceBrowserConsoleLogSeverity CefLogSeverityToWebBrowser(cef_log_severi
void FCEFWebInterfaceBrowserWindow::HandleOnConsoleMessage(CefRefPtr<CefBrowser> Browser, cef_log_severity_t Level, const CefString& Message, const CefString& Source, int32 Line)
{
- ConsoleMessageDelegate.ExecuteIfBound(WCHAR_TO_TCHAR(Message.ToWString().c_str()), WCHAR_TO_TCHAR(Source.ToWString().c_str()), Line, CefLogSeverityToWebBrowser(Level));
+ ConsoleMessageDelegate.ExecuteIfBound(WCHAR_TO_TCHAR(Message.ToWString().c_str()), WCHAR_TO_TCHAR(Source.ToWString().c_str()), Line, CefLogSeverityToWebBrowserWebUI(Level));
}
TOptional<FString> FCEFWebInterfaceBrowserWindow::GetResourceContent( CefRefPtr< CefFrame > Frame, CefRefPtr< CefRequest > Request)
--
GitLab