From 813137db5bac82315b7b1c834881b4c615ab7713 Mon Sep 17 00:00:00 2001 From: Jessica James Date: Sun, 7 Jun 2020 03:48:30 -0500 Subject: [PATCH] clang compilation fixes --- build/Clang/CMakeLists.txt | 4 ++++ src/Plugins/RenX/RenX.Core/RenX_GameCommand.cpp | 2 +- src/Plugins/RenX/RenX.Core/RenX_GameCommand.h | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 build/Clang/CMakeLists.txt diff --git a/build/Clang/CMakeLists.txt b/build/Clang/CMakeLists.txt new file mode 100644 index 0000000..2cdc287 --- /dev/null +++ b/build/Clang/CMakeLists.txt @@ -0,0 +1,4 @@ +# Clang-specific compiler settings + +# Enable pthreads +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread") diff --git a/src/Plugins/RenX/RenX.Core/RenX_GameCommand.cpp b/src/Plugins/RenX/RenX.Core/RenX_GameCommand.cpp index bbc22f1..118ae3d 100644 --- a/src/Plugins/RenX/RenX.Core/RenX_GameCommand.cpp +++ b/src/Plugins/RenX/RenX.Core/RenX_GameCommand.cpp @@ -25,7 +25,7 @@ Jupiter::ArrayList *RenX::GameMasterCommandList = &_GameMaste RenX::Server *RenX::GameCommand::active_server = nullptr; RenX::Server *RenX::GameCommand::selected_server = nullptr; -RenX::GameCommand::GameCommand(nullptr_t) +RenX::GameCommand::GameCommand(std::nullptr_t) { } diff --git a/src/Plugins/RenX/RenX.Core/RenX_GameCommand.h b/src/Plugins/RenX/RenX.Core/RenX_GameCommand.h index e790877..a371a37 100644 --- a/src/Plugins/RenX/RenX.Core/RenX_GameCommand.h +++ b/src/Plugins/RenX/RenX.Core/RenX_GameCommand.h @@ -89,7 +89,7 @@ namespace RenX /** * @brief Same as the Default constructor, except that the command is not added to the master command list. */ - GameCommand(nullptr_t); + GameCommand(std::nullptr_t); /** * @brief Copy constructor for a Game Command.