bump the plugin version to v1.0.2

SenseGloveCore modules, so that the C++ users of the API don't need to
 explicitly add it as a dependency
* Clean up the redundant headers/modules dependency from SGCore headers
* Fix RunUAT build issues for Epic Store submission

CHANGELOG.md

@@ -1,30 +1,9 @@
 # Changelog
-
 All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [1.0.4] - 2022-12-02
-
-This is a minor release focusing mostly on adherence to the Unreal Engine Marketplace Guidelines based on the feedback from Epic Games.
-
-### Added
-
-- Added support for MSVC 2017
-
-### Changed
-
-- Updated SenseGlove libraries (SGCore/SGConnect) to v2.0.4.
-
-## [1.0.3] - 2022-11-29
-
-This is a minor release focusing on adherence to the Unreal Engine Marketplace Guidelines based on the feedback from Epic Games.
-
-### Changed
-
-- Adjust Config/FilterPlugin.ini in order to conform to Epic's Market Place Guidelines.
-
 ## [1.0.2] - 2022-11-27
 
 This is a minor release focusing on adherence to the Unreal Engine Marketplace Guidelines based on the feedback from Epic Games.

Config/FilterPlugin.ini

@@ -1,3 +1,10 @@
 [FilterPlugin]
+/.clang-format
+/.editorconfig
+/.gitattributes
+/.gitignore
 /CHANGELOG.md
 /Config/FilterPlugin.ini
+/LICENSE.md
+/LICENSE-THIRD-PARTY.md
+/README.md

README.md

@@ -6,16 +6,16 @@ This repository relies on Git LFS for storing binary blobs (e.g. third-party lib
 
 ## Platform Support Matrix
 
-|          | **Windows<br>(MSVC 2017)** | **Windows<br>(MSVC 2019)** | **Windows<br>(MSVC 2022)** | **Linux<br>(Native Toolchain)** | **macOS** | **Oculus Mobile<br>(Android NDK r21b)** |
-|----------|:--------------------------:|:--------------------------:|:--------------------------:|:-------------------------------:|:---------:|:---------------------------------------:|
-| **4.22** |              ✅             |              ✅             |              ❌             |                ✅                |     ❌     |                    ❌                    |
-| **4.23** |              ✅             |              ✅             |              ❌             |                ✅                |     ❌     |                    ❌                    |
-| **4.24** |              ✅             |              ✅             |              ❌             |                ✅                |     ❌     |                    ❌                    |
-| **4.25** |              ✅             |              ✅             |              ❌             |                ✅                |     ❌     |                    ❓                    |
-| **4.26** |              ✅             |              ✅             |              ❌             |                ✅                |     ❌     |                    ❓                    |
-| **4.27** |              ✅             |              ✅             |              ✅             |                ✅                |     ❌     |                    ❓                    |
-|  **5.0** |              ❌             |              ✅             |              ✅             |                ✅                |     ❌     |                    ❓                    |
-|  **5.1** |              ❌             |              ✅             |              ✅             |                ✅                |     ❌     |                    ❓                    |
+|          | **Windows<br>(MSVC 2019)** | **Windows<br>(MSVC 2022)** | **Linux<br>(Native Toolchain)** | **macOS** | **Oculus Mobile<br>(Android NDK r21b)** |
+|----------|:--------------------------:|:--------------------------:|:-------------------------------:|:---------:|:---------------------------------------:|
+| **4.22** |              ✅             |              ❌             |                ✅                |     ❌     |                    ❌                    |
+| **4.23** |              ✅             |              ❌             |                ✅                |     ❌     |                    ❌                    |
+| **4.24** |              ✅             |              ❌             |                ✅                |     ❌     |                    ❌                    |
+| **4.25** |              ✅             |              ❌             |                ✅                |     ❌     |                    ❓                    |
+| **4.26** |              ✅             |              ❌             |                ✅                |     ❌     |                    ❓                    |
+| **4.27** |              ✅             |              ✅             |                ✅                |     ❌     |                    ❓                    |
+| **5.0**  |              ✅             |              ✅             |                ✅                |     ❌     |                    ❓                    |
+| **5.1**  |              ✅             |              ✅             |                ✅                |     ❌     |                    ❓                    |
 
 * <code>✅</code> Supported
 * <code>❌</code> Not Supported

SenseGlove.uplugin

@@ -1,7 +1,7 @@
 {
 	"FileVersion": 3,
 	"Version": 1,
-	"VersionName": "1.0.4",
+	"VersionName": "1.0.2",
 	"FriendlyName": "SenseGlove",
 	"Description": "Integrating the SenseGlove haptic controller into Unreal Engine",
 	"Category": "Virtual Reality",
@@ -10,7 +10,6 @@
 	"DocsURL": "https://senseglove.gitlab.io/unreal-blueprint-docs/",
 	"MarketplaceURL": "com.epicgames.launcher://ue/marketplace/product/5e1d408f517b4966a269ec1035de0b9e",
 	"SupportURL": "https://www.senseglove.com/support/",
-	"EngineVersion": "4.23.0",
 	"CanContainContent": true,
 	"IsBetaVersion": false,
 	"IsExperimentalVersion": false,

Source/SenseGloveConnectImpl/Private/SGConnectImpl/SGPlatform.cpp

@@ -1,36 +0,0 @@
-/**
- * @file
- *
- * @author  Mamadou Babaei <mamadou@senseglove.com>
- *
- * @section LICENSE
- *
- * (The MIT License)
- *
- * Copyright (c) 2020 - 2022 SenseGlove
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * @section DESCRIPTION
- *
- *
- */
-
-
-#include "SGConnectImpl/SGPlatform.h"

Source/SenseGloveConnectImpl/Public/SGConnectImpl/SGPlatform.h

@@ -1,42 +0,0 @@
-/**
- * @file
- *
- * @author  Mamadou Babaei <mamadou@senseglove.com>
- *
- * @section LICENSE
- *
- * (The MIT License)
- *
- * Copyright (c) 2020 - 2022 SenseGlove
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * @section DESCRIPTION
- *
- *
- */
-
-
-#pragma once
-
-#if ( ( defined( _MSVC_LANG ) && _MSVC_LANG >= 201703L ) || __cplusplus >= 201703L )
-#define SG_CPP17 1
-#else   /* ( ( defined( _MSVC_LANG ) && _MSVC_LANG >= 201703L ) || __cplusplus >= 201703L ) */
-#define SG_CPP17 0
-#endif  /* ( ( defined( _MSVC_LANG ) && _MSVC_LANG >= 201703L ) || __cplusplus >= 201703L ) */

Source/SenseGloveConnectImpl/SenseGloveConnectImpl.Build.cs

@@ -133,17 +133,11 @@ public class SenseGloveConnectImpl : ModuleRules
                 case WindowsCompiler.VisualStudio2019:
                     LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "msvc142"));
                     break;
-#endif
-#if ! UE_5_0_OR_LATER && UE_4_17_OR_LATER
-                case WindowsCompiler.VisualStudio2017:
-                    LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "msvc141"));
-                    break;
 #endif
                 default:
                     Debug.Assert(false, "Unsupported compiler!");
                     break;
             }
-
             LibraryName = string.Format("{0}.lib", LibraryName);
         }
         else
@@ -228,17 +222,11 @@ public class SenseGloveConnectImpl : ModuleRules
                 case WindowsCompiler.VisualStudio2019:
                     LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "msvc142"));
                     break;
-#endif
-#if ! UE_5_0_OR_LATER && UE_4_17_OR_LATER
-                case WindowsCompiler.VisualStudio2017:
-                    LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "msvc141"));
-                    break;
 #endif
                 default:
                     Debug.Assert(false, "Unsupported compiler!");
                     break;
             }
-
             LibraryName = string.Format("{0}.lib", LibraryName);
         }
         else

Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGBasicHandModelImpl.cpp

@@ -78,7 +78,7 @@ struct FSGBasicHandModelImpl::FImpl
     FImpl& operator=(const FImpl& Rhs) = default;
 };
 
-FSGBasicHandModelImpl FSGBasicHandModelImpl::Default(const bool bRightHanded)
+FSGBasicHandModelImpl FSGBasicHandModelImpl::Default(bool bRightHanded)
 {
     return FSGBasicHandModelImpl(FSGBasicHandModelImpl::FBasicHandModelType::Default(bRightHanded));
 }
@@ -119,22 +119,22 @@ const TArray<FVector>& FSGBasicHandModelImpl::GetBaseJointAngles()
 
 FSGBasicHandModelImpl::FSGBasicHandModelImpl()
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
 }
 
-FSGBasicHandModelImpl::FSGBasicHandModelImpl(const bool bRightHanded, const TArray<TArray<float>>& Lengths,
+FSGBasicHandModelImpl::FSGBasicHandModelImpl(bool bRightHanded, const TArray<TArray<float>>& Lengths,
                                              const TArray<FVector>& StartPositions)
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     std::vector<std::vector<float>> LengthsVector{
         FSGArrayUtils::ToMillimeters(Lengths)
@@ -148,14 +148,14 @@ FSGBasicHandModelImpl::FSGBasicHandModelImpl(const bool bRightHanded, const TArr
                                                                        MoveTemp(StartPositionsVector));
 }
 
-FSGBasicHandModelImpl::FSGBasicHandModelImpl(const bool bRightHanded, const TArray<TArray<float>>& Lengths,
+FSGBasicHandModelImpl::FSGBasicHandModelImpl(bool bRightHanded, const TArray<TArray<float>>& Lengths,
                                              const TArray<FVector>& StartPositions, const TArray<FQuat>& StartRotations)
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     std::vector<std::vector<float>> LengthsVector{
         FSGArrayUtils::ToMillimeters(Lengths)
@@ -176,30 +176,30 @@ FSGBasicHandModelImpl::FSGBasicHandModelImpl(const bool bRightHanded, const TArr
 
 FSGBasicHandModelImpl::FSGBasicHandModelImpl(const FBasicHandModelType& BasicHandModel)
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     Pimpl->BasicHandModel = BasicHandModel;
 }
 
 FSGBasicHandModelImpl::FSGBasicHandModelImpl(const FSGBasicHandModelImpl& Rhs)
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{*Rhs.Pimpl}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{*Rhs.Pimpl}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     Pimpl->Owner = this;
 }
 
 FSGBasicHandModelImpl::FSGBasicHandModelImpl(FSGBasicHandModelImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
     = default;
 
 FSGBasicHandModelImpl::~FSGBasicHandModelImpl() = default;
@@ -212,9 +212,9 @@ FSGBasicHandModelImpl& FSGBasicHandModelImpl::operator=(const FSGBasicHandModelI
 }
 
 FSGBasicHandModelImpl& FSGBasicHandModelImpl::operator=(FSGBasicHandModelImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
     = default;
 
 const FSGBasicHandModelImpl::FBasicHandModelType& FSGBasicHandModelImpl::ToBasicHandModel() const

Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGBetaDeviceImpl.cpp

@@ -77,11 +77,11 @@ TSharedRef<FSGBetaDeviceImpl> FSGBetaDeviceImpl::Parse(const FString& String)
 
 FSGBetaDeviceImpl::FSGBetaDeviceImpl()
     : FSGDeviceImpl(),
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
       Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
       Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
 }
 
@@ -93,49 +93,49 @@ FSGBetaDeviceImpl::FSGBetaDeviceImpl(const FString& ConstantsString, const FStri
           TCHAR_TO_UTF8(*HardwareVersion),
           FirmwareVersion,
           SubFirmwareVersion)),
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
       Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
       Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
 }
 
 FSGBetaDeviceImpl::FSGBetaDeviceImpl(const FBetaDeviceType BetaDevice)
     : FSGDeviceImpl(std::make_shared<FBetaDeviceType>(BetaDevice)),
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
       Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
       Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
 }
 
 FSGBetaDeviceImpl::FSGBetaDeviceImpl(const FBetaDevicePtrType BetaDevice)
     : FSGDeviceImpl(BetaDevice),
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
       Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
       Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
 }
 
 FSGBetaDeviceImpl::FSGBetaDeviceImpl(const FSGBetaDeviceImpl& Rhs)
     : FSGDeviceImpl(Rhs),
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
       Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{*Rhs.Pimpl}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{*Rhs.Pimpl}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     Pimpl->Owner = this;
 }
 
 FSGBetaDeviceImpl::FSGBetaDeviceImpl(FSGBetaDeviceImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
     = default;
 
 FSGBetaDeviceImpl::~FSGBetaDeviceImpl() = default;
@@ -149,9 +149,9 @@ FSGBetaDeviceImpl& FSGBetaDeviceImpl::operator=(const FSGBetaDeviceImpl& Rhs)
 }
 
 FSGBetaDeviceImpl& FSGBetaDeviceImpl::operator=(FSGBetaDeviceImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
     = default;
 
 FSGBetaDeviceImpl::FBetaDeviceType FSGBetaDeviceImpl::ToBetaDevice() const

Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGBuzzCommandImpl.cpp

@@ -75,80 +75,80 @@ const FSGBuzzCommandImpl& FSGBuzzCommandImpl::Off()
 
 FSGBuzzCommandImpl::FSGBuzzCommandImpl()
     : FSGFingerCommandImpl(MakeShared<FBuzzCommandType>()),
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
 }
 
 FSGBuzzCommandImpl::FSGBuzzCommandImpl(const TArray<int32>& BuzzLevels)
     : FSGFingerCommandImpl(MakeShared<FBuzzCommandType>(FSGArrayUtils::ToStdVector<int32>(BuzzLevels))),
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
 }
 
 FSGBuzzCommandImpl::FSGBuzzCommandImpl(const int32 Thumb, const int32 Index, const int32 Middle, const int32 Ring,
                                        const int32 Pinky)
     : FSGFingerCommandImpl(MakeShared<FBuzzCommandType>(Thumb, Index, Middle, Ring, Pinky)),
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
 }
 
 FSGBuzzCommandImpl::FSGBuzzCommandImpl(const ESGFinger Finger, const int32 BuzzLevel)
     : FSGFingerCommandImpl(MakeShared<FBuzzCommandType>(FSGCoreEnumCast::ToEFinger(Finger), BuzzLevel)),
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
 }
 
 FSGBuzzCommandImpl::FSGBuzzCommandImpl(const FBuzzCommandType& BuzzCommand)
     : FSGFingerCommandImpl(MakeShared<FBuzzCommandType>(BuzzCommand)),
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
 }
 
 FSGBuzzCommandImpl::FSGBuzzCommandImpl(const TSharedRef<FBuzzCommandType> BuzzCommand)
     : FSGFingerCommandImpl(BuzzCommand),
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
 }
 
 FSGBuzzCommandImpl::FSGBuzzCommandImpl(const FSGBuzzCommandImpl& Rhs)
     : FSGFingerCommandImpl(Rhs),
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{*Rhs.Pimpl}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{*Rhs.Pimpl}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     Pimpl->Owner = this;
 }
 
 FSGBuzzCommandImpl::FSGBuzzCommandImpl(FSGBuzzCommandImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
     = default;
 
 FSGBuzzCommandImpl::~FSGBuzzCommandImpl() = default;
@@ -162,9 +162,9 @@ FSGBuzzCommandImpl& FSGBuzzCommandImpl::operator=(const FSGBuzzCommandImpl& Rhs)
 }
 
 FSGBuzzCommandImpl& FSGBuzzCommandImpl::operator=(FSGBuzzCommandImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
     = default;
 
 const FSGBuzzCommandImpl::FBuzzCommandType& FSGBuzzCommandImpl::ToBuzzCommand() const

Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGCalibrationDataPointImpl.cpp

@@ -77,22 +77,22 @@ struct FSGCalibrationDataPointImpl::FImpl
 
 FSGCalibrationDataPointImpl::FSGCalibrationDataPointImpl()
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
 }
 
 FSGCalibrationDataPointImpl::FSGCalibrationDataPointImpl(const int32 CurrentStage,
                                                          const TArray<FVector>& CalibrationValues)
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     std::vector<FSGVect3DImpl::FVect3DType> Values(
         FSGArrayUtils::ToStdVector<FVector, FSGVect3DImpl::FVect3DType, FSGVect3DImpl, &FSGVect3DImpl::ToVect3D>(
@@ -102,30 +102,30 @@ FSGCalibrationDataPointImpl::FSGCalibrationDataPointImpl(const int32 CurrentStag
 
 FSGCalibrationDataPointImpl::FSGCalibrationDataPointImpl(const FCalibrationDataPointType& CalibrationDataPoint)
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     Pimpl->CalibrationDataPoint = CalibrationDataPoint;
 }
 
 FSGCalibrationDataPointImpl::FSGCalibrationDataPointImpl(const FSGCalibrationDataPointImpl& Rhs)
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{*Rhs.Pimpl}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{*Rhs.Pimpl}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     Pimpl->Owner = this;
 }
 
 FSGCalibrationDataPointImpl::FSGCalibrationDataPointImpl(FSGCalibrationDataPointImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
     = default;
 
 FSGCalibrationDataPointImpl::~FSGCalibrationDataPointImpl() = default;
@@ -138,9 +138,9 @@ FSGCalibrationDataPointImpl& FSGCalibrationDataPointImpl::operator=(const FSGCal
 }
 
 FSGCalibrationDataPointImpl& FSGCalibrationDataPointImpl::operator=(FSGCalibrationDataPointImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 = default;
 
 const FSGCalibrationDataPointImpl::FCalibrationDataPointType&

Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGDeviceImpl.cpp

@@ -90,21 +90,21 @@ FString FSGDeviceImpl::ToString(ESGDeviceType DeviceType)
 
 FSGDeviceImpl::FSGDeviceImpl()
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
 }
 
 FSGDeviceImpl::FSGDeviceImpl(const FSGDevicePtrType SGDevice)
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     ensureAlwaysMsgf(SGDevice.get(), TEXT("Invalid SGDevice!"));
     Pimpl->SGDevice = SGDevice;
@@ -112,19 +112,19 @@ FSGDeviceImpl::FSGDeviceImpl(const FSGDevicePtrType SGDevice)
 
 FSGDeviceImpl::FSGDeviceImpl(const FSGDeviceImpl& Rhs)
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{*Rhs.Pimpl}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{*Rhs.Pimpl}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     Pimpl->Owner = this;
 }
 
 FSGDeviceImpl::FSGDeviceImpl(FSGDeviceImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
     = default;
 
 FSGDeviceImpl::~FSGDeviceImpl() = default;
@@ -137,9 +137,9 @@ FSGDeviceImpl& FSGDeviceImpl::operator=(const FSGDeviceImpl& Rhs)
 }
 
 FSGDeviceImpl& FSGDeviceImpl::operator=(FSGDeviceImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
     = default;
 
 FSGDeviceImpl::FSGDevicePtrType FSGDeviceImpl::ToSGDevicePtr() const

Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGDeviceModelImpl.cpp

@@ -97,22 +97,22 @@ void FSGDeviceModelImpl::ParseFirmware(const FString& RawFirmware, int32& OutMai
 
 FSGDeviceModelImpl::FSGDeviceModelImpl()
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
 }
 
 FSGDeviceModelImpl::FSGDeviceModelImpl(
     const FString& Id, const FString& HardwareVersion, const int32 FirmwareVersion, const int32 SubFirmwareVersion)
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     std::string IdString(TCHAR_TO_UTF8(*Id));
     std::string HardwareVersionString(TCHAR_TO_UTF8(*HardwareVersion));
@@ -122,30 +122,30 @@ FSGDeviceModelImpl::FSGDeviceModelImpl(
 
 FSGDeviceModelImpl::FSGDeviceModelImpl(const FDeviceModelType& DeviceModel)
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     Pimpl->DeviceModel = DeviceModel;
 }
 
 FSGDeviceModelImpl::FSGDeviceModelImpl(const FSGDeviceModelImpl& Rhs)
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{*Rhs.Pimpl}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{*Rhs.Pimpl}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     Pimpl->Owner = this;
 }
 
 FSGDeviceModelImpl::FSGDeviceModelImpl(FSGDeviceModelImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
     = default;
 
 FSGDeviceModelImpl::~FSGDeviceModelImpl() = default;
@@ -158,9 +158,9 @@ FSGDeviceModelImpl& FSGDeviceModelImpl::operator=(const FSGDeviceModelImpl& Rhs)
 }
 
 FSGDeviceModelImpl& FSGDeviceModelImpl::operator=(FSGDeviceModelImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
     = default;
 
 const FSGDeviceModelImpl::FDeviceModelType& FSGDeviceModelImpl::ToDeviceModel() const

Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGFingerCommandImpl.cpp

@@ -84,21 +84,21 @@ struct FSGFingerCommandImpl::FImpl
 
 FSGFingerCommandImpl::FSGFingerCommandImpl()
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
 }
 
 FSGFingerCommandImpl::FSGFingerCommandImpl(const TArray<int32>& Levels)
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     std::vector<int32> LevelsVector{
         FSGArrayUtils::ToStdVector<int32>(Levels)
@@ -108,42 +108,42 @@ FSGFingerCommandImpl::FSGFingerCommandImpl(const TArray<int32>& Levels)
 
 FSGFingerCommandImpl::FSGFingerCommandImpl(const FFingerCommandType& FingerCommand)
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     Pimpl->FingerCommand = MakeShared<FFingerCommandType>(FingerCommand);
 }
 
 FSGFingerCommandImpl::FSGFingerCommandImpl(const TSharedRef<FFingerCommandType> FingerCommand)
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     Pimpl->FingerCommand = FImpl::MakeNewFingerCommand(FingerCommand);
 }
 
 FSGFingerCommandImpl::FSGFingerCommandImpl(const FSGFingerCommandImpl& Rhs)
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{*Rhs.Pimpl}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{*Rhs.Pimpl}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     Pimpl->Owner = this;
     Pimpl->FingerCommand = FImpl::MakeNewFingerCommand(Rhs.Pimpl->FingerCommand);
 }
 
 FSGFingerCommandImpl::FSGFingerCommandImpl(FSGFingerCommandImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
     = default;
 
 FSGFingerCommandImpl::~FSGFingerCommandImpl() = default;
@@ -156,9 +156,9 @@ FSGFingerCommandImpl& FSGFingerCommandImpl::operator=(const FSGFingerCommandImpl
 }
 
 FSGFingerCommandImpl& FSGFingerCommandImpl::operator=(FSGFingerCommandImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
     = default;
 
 const FSGFingerCommandImpl::FFingerCommandType& FSGFingerCommandImpl::ToFingerCommand() const

Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGForceFeedbackCommandImpl.cpp

@@ -75,81 +75,81 @@ const FSGForceFeedbackCommandImpl& FSGForceFeedbackCommandImpl::Off()
 
 FSGForceFeedbackCommandImpl::FSGForceFeedbackCommandImpl()
     : FSGFingerCommandImpl(MakeShared<FForceFeedbackCommandType>()),
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
 }
 
 FSGForceFeedbackCommandImpl::FSGForceFeedbackCommandImpl(const TArray<int32>& ForceFeedbackLevels)
     : FSGFingerCommandImpl(MakeShared<FForceFeedbackCommandType>(
         FSGArrayUtils::ToStdVector<int32>(ForceFeedbackLevels))),
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
 }
 
 FSGForceFeedbackCommandImpl::FSGForceFeedbackCommandImpl(const int32 Thumb, const int32 Index, const int32 Middle,
                                                          const int32 Ring, const int32 Pinky)
     : FSGFingerCommandImpl(MakeShared<FForceFeedbackCommandType>(Thumb, Index, Middle, Ring, Pinky)),
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
 }
 
 FSGForceFeedbackCommandImpl::FSGForceFeedbackCommandImpl(const ESGFinger Finger, const int32 BuzzLevel)
     : FSGFingerCommandImpl(MakeShared<FForceFeedbackCommandType>(FSGCoreEnumCast::ToEFinger(Finger), BuzzLevel)),
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
 }
 
 FSGForceFeedbackCommandImpl::FSGForceFeedbackCommandImpl(const FForceFeedbackCommandType& ForceFeedbackCommand)
     : FSGFingerCommandImpl(MakeShared<FForceFeedbackCommandType>(ForceFeedbackCommand)),
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
 }
 
 FSGForceFeedbackCommandImpl::FSGForceFeedbackCommandImpl(const TSharedRef<FForceFeedbackCommandType> ForceFeedbackCommand)
     : FSGFingerCommandImpl(ForceFeedbackCommand),
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
 }
 
 FSGForceFeedbackCommandImpl::FSGForceFeedbackCommandImpl(const FSGForceFeedbackCommandImpl& Rhs)
     : FSGFingerCommandImpl(Rhs),
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{*Rhs.Pimpl}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{*Rhs.Pimpl}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     Pimpl->Owner = this;
 }
 
 FSGForceFeedbackCommandImpl::FSGForceFeedbackCommandImpl(FSGForceFeedbackCommandImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
     = default;
 
 FSGForceFeedbackCommandImpl::~FSGForceFeedbackCommandImpl() = default;
@@ -163,9 +163,9 @@ FSGForceFeedbackCommandImpl& FSGForceFeedbackCommandImpl::operator=(const FSGFor
 }
 
 FSGForceFeedbackCommandImpl& FSGForceFeedbackCommandImpl::operator=(FSGForceFeedbackCommandImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 = default;
 
 const FSGForceFeedbackCommandImpl::FForceFeedbackCommandType& FSGForceFeedbackCommandImpl::ToForceFeedbackCommand() const

Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHandInterpolatorImpl.cpp

@@ -133,21 +133,21 @@ TArray<TArray<FVector>> FSGHandInterpolatorImpl::InterpolateHandAngles(const FSG
 
 FSGHandInterpolatorImpl::FSGHandInterpolatorImpl()
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
 }
 
 FSGHandInterpolatorImpl::FSGHandInterpolatorImpl(const TArray<TArray<FSGInterpolationSetImpl>>& JointInterpolations)
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     std::vector<std::vector<FSGInterpolationSetImpl::FInterpolationSetType>> JointInterpolationsVector{
         FSGArrayUtils::ToStdVector<FSGInterpolationSetImpl, FSGInterpolationSetImpl::FInterpolationSetType,
@@ -159,11 +159,11 @@ FSGHandInterpolatorImpl::FSGHandInterpolatorImpl(const TArray<TArray<FSGInterpol
 FSGHandInterpolatorImpl::FSGHandInterpolatorImpl(const TArray<TArray<FSGInterpolationSetImpl>>& JointInterpolations,
                                                  const FQuat& CmcStartRotation)
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     std::vector<std::vector<FSGInterpolationSetImpl::FInterpolationSetType>> JointInterpolationsVector{
         FSGArrayUtils::ToStdVector<FSGInterpolationSetImpl, FSGInterpolationSetImpl::FInterpolationSetType,
@@ -175,30 +175,30 @@ FSGHandInterpolatorImpl::FSGHandInterpolatorImpl(const TArray<TArray<FSGInterpol
 
 FSGHandInterpolatorImpl::FSGHandInterpolatorImpl(const FHandInterpolatorType& HandInterpolator)
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     Pimpl->HandInterpolator = HandInterpolator;
 }
 
 FSGHandInterpolatorImpl::FSGHandInterpolatorImpl(const FSGHandInterpolatorImpl& Rhs)
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{*Rhs.Pimpl}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{*Rhs.Pimpl}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     Pimpl->Owner = this;
 }
 
 FSGHandInterpolatorImpl::FSGHandInterpolatorImpl(FSGHandInterpolatorImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
     = default;
 
 FSGHandInterpolatorImpl::~FSGHandInterpolatorImpl() = default;
@@ -211,9 +211,9 @@ FSGHandInterpolatorImpl& FSGHandInterpolatorImpl::operator=(const FSGHandInterpo
 }
 
 FSGHandInterpolatorImpl& FSGHandInterpolatorImpl::operator=(FSGHandInterpolatorImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 = default;
 
 const FSGHandInterpolatorImpl::FHandInterpolatorType& FSGHandInterpolatorImpl::ToHandInterpolator(

Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHandPoseImpl.cpp

@@ -146,22 +146,22 @@ FSGHandPoseImpl FSGHandPoseImpl::Fist(const bool bRightHanded)
 
 FSGHandPoseImpl::FSGHandPoseImpl()
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
 }
 
 FSGHandPoseImpl::FSGHandPoseImpl(const bool bRightHanded, const TArray<TArray<FVector>>& JointPositions,
                                  const TArray<TArray<FQuat>>& JointRotations, const TArray<TArray<FVector>>& HandAngles)
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     std::vector<std::vector<FSGVect3DImpl::FVect3DType>> JointPositionsVector{
         FSGArrayUtils::ToMillimeters<FSGVect3DImpl::FVect3DType, FSGVect3DImpl>(JointPositions)
@@ -181,30 +181,30 @@ FSGHandPoseImpl::FSGHandPoseImpl(const bool bRightHanded, const TArray<TArray<FV
 
 FSGHandPoseImpl::FSGHandPoseImpl(const FHandPoseType& SenseGloveHandPose)
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     Pimpl->HandPose = SenseGloveHandPose;
 }
 
 FSGHandPoseImpl::FSGHandPoseImpl(const FSGHandPoseImpl& Rhs)
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{*Rhs.Pimpl}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{*Rhs.Pimpl}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     Pimpl->Owner = this;
 }
 
 FSGHandPoseImpl::FSGHandPoseImpl(FSGHandPoseImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
     = default;
 
 FSGHandPoseImpl::~FSGHandPoseImpl() = default;
@@ -217,9 +217,9 @@ FSGHandPoseImpl& FSGHandPoseImpl::operator=(const FSGHandPoseImpl& Rhs)
 }
 
 FSGHandPoseImpl& FSGHandPoseImpl::operator=(FSGHandPoseImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 = default;
 
 const FSGHandPoseImpl::FHandPoseType& FSGHandPoseImpl::ToHandPose() const

Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHandProfileImpl.cpp

@@ -142,11 +142,11 @@ void FSGHandProfileImpl::ResetCalibration(const bool bOnDisk)
 
 FSGHandProfileImpl::FSGHandProfileImpl()
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
 }
 
@@ -154,11 +154,11 @@ FSGHandProfileImpl::FSGHandProfileImpl(const bool bRightHanded,
                                        const FSGSenseGloveHandProfileImpl& SenseGloveHandProfile,
                                        const FSGNovaGloveHandProfileImpl& NovaGloveHandProfile)
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     Pimpl->HandProfile = FHandProfileType(
         bRightHanded, SenseGloveHandProfile.ToSenseGloveHandProfile(), NovaGloveHandProfile.ToNovaGloveHandProfile());
@@ -166,30 +166,30 @@ FSGHandProfileImpl::FSGHandProfileImpl(const bool bRightHanded,
 
 FSGHandProfileImpl::FSGHandProfileImpl(const FHandProfileType& SenseGloveHandProfile)
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     Pimpl->HandProfile = SenseGloveHandProfile;
 }
 
 FSGHandProfileImpl::FSGHandProfileImpl(const FSGHandProfileImpl& Rhs)
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{*Rhs.Pimpl}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{*Rhs.Pimpl}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     Pimpl->Owner = this;
 }
 
 FSGHandProfileImpl::FSGHandProfileImpl(FSGHandProfileImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
     = default;
 
 FSGHandProfileImpl::~FSGHandProfileImpl() = default;
@@ -202,9 +202,9 @@ FSGHandProfileImpl& FSGHandProfileImpl::operator=(const FSGHandProfileImpl& Rhs)
 }
 
 FSGHandProfileImpl& FSGHandProfileImpl::operator=(FSGHandProfileImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 = default;
 
 const FSGHandProfileImpl::FHandProfileType& FSGHandProfileImpl::ToHandProfile(

Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHapticGloveCalibrationCheckImpl.cpp

@@ -158,21 +158,21 @@ bool FSGHapticGloveCalibrationCheckImpl::MatchesLast(const TArray<FVector>& Curr
 
 FSGHapticGloveCalibrationCheckImpl::FSGHapticGloveCalibrationCheckImpl()
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
 }
 
 FSGHapticGloveCalibrationCheckImpl::FSGHapticGloveCalibrationCheckImpl(const FSGSensorRangeImpl& LastCalibrationRange)
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     Pimpl->HapticGloveCalibrationCheck = FHapticGloveCalibrationCheckType(LastCalibrationRange.ToSensorRange());
 }
@@ -180,11 +180,11 @@ FSGHapticGloveCalibrationCheckImpl::FSGHapticGloveCalibrationCheckImpl(const FSG
 FSGHapticGloveCalibrationCheckImpl::FSGHapticGloveCalibrationCheckImpl(
     const FHapticGloveCalibrationCheckType& HapticGloveCalibrationCheck)
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     Pimpl->HapticGloveCalibrationCheck = HapticGloveCalibrationCheck;
 }
@@ -192,20 +192,20 @@ FSGHapticGloveCalibrationCheckImpl::FSGHapticGloveCalibrationCheckImpl(
 FSGHapticGloveCalibrationCheckImpl::FSGHapticGloveCalibrationCheckImpl(
     const FSGHapticGloveCalibrationCheckImpl& Rhs)
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{*Rhs.Pimpl}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{*Rhs.Pimpl}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     Pimpl->Owner = this;
 }
 
 FSGHapticGloveCalibrationCheckImpl::FSGHapticGloveCalibrationCheckImpl(
     FSGHapticGloveCalibrationCheckImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
     = default;
 
 FSGHapticGloveCalibrationCheckImpl::~FSGHapticGloveCalibrationCheckImpl() = default;
@@ -220,9 +220,9 @@ FSGHapticGloveCalibrationCheckImpl& FSGHapticGloveCalibrationCheckImpl::operator
 
 FSGHapticGloveCalibrationCheckImpl& FSGHapticGloveCalibrationCheckImpl::operator=(
     FSGHapticGloveCalibrationCheckImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
     = default;
 
 const FSGHapticGloveCalibrationCheckImpl::FHapticGloveCalibrationCheckType&

Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHapticGloveCalibrationSequenceImpl.cpp

@@ -114,22 +114,22 @@ bool FSGHapticGloveCalibrationSequenceImpl::CompileProfile(const FSGSensorRangeI
 
 FSGHapticGloveCalibrationSequenceImpl::FSGHapticGloveCalibrationSequenceImpl()
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
 }
 
 FSGHapticGloveCalibrationSequenceImpl::FSGHapticGloveCalibrationSequenceImpl(
     const TSharedRef<FSGHapticGloveImpl> LinkedGlove)
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     Pimpl->HapticGloveCalibrationSequence = MakeShared<FHapticGloveCalibrationSequenceType>(
         LinkedGlove->ToHapticGlovePtrChecked());
@@ -138,11 +138,11 @@ FSGHapticGloveCalibrationSequenceImpl::FSGHapticGloveCalibrationSequenceImpl(
 FSGHapticGloveCalibrationSequenceImpl::FSGHapticGloveCalibrationSequenceImpl(
     const FHapticGloveCalibrationSequenceType& HapticGloveCalibrationSequence)
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     Pimpl->HapticGloveCalibrationSequence = MakeShared<FHapticGloveCalibrationSequenceType>(
         HapticGloveCalibrationSequence);
@@ -151,11 +151,11 @@ FSGHapticGloveCalibrationSequenceImpl::FSGHapticGloveCalibrationSequenceImpl(
 FSGHapticGloveCalibrationSequenceImpl::FSGHapticGloveCalibrationSequenceImpl(
     TSharedRef<FHapticGloveCalibrationSequenceType> HapticGloveCalibrationSequence)
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     Pimpl->HapticGloveCalibrationSequence =
         Pimpl->MakeNewHapticGloveCalibrationSequence(HapticGloveCalibrationSequence);
@@ -164,20 +164,20 @@ FSGHapticGloveCalibrationSequenceImpl::FSGHapticGloveCalibrationSequenceImpl(
 FSGHapticGloveCalibrationSequenceImpl::FSGHapticGloveCalibrationSequenceImpl(
     const FSGHapticGloveCalibrationSequenceImpl& Rhs)
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{*Rhs.Pimpl}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{*Rhs.Pimpl}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     Pimpl->Owner = this;
 }
 
 FSGHapticGloveCalibrationSequenceImpl::FSGHapticGloveCalibrationSequenceImpl(
     FSGHapticGloveCalibrationSequenceImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
     = default;
 
 FSGHapticGloveCalibrationSequenceImpl::~FSGHapticGloveCalibrationSequenceImpl() = default;
@@ -192,9 +192,9 @@ FSGHapticGloveCalibrationSequenceImpl& FSGHapticGloveCalibrationSequenceImpl::op
 
 FSGHapticGloveCalibrationSequenceImpl& FSGHapticGloveCalibrationSequenceImpl::operator=(
     FSGHapticGloveCalibrationSequenceImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
     = default;
 
 const FSGHapticGloveCalibrationSequenceImpl::FHapticGloveCalibrationSequenceType&

Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHapticGloveCommandBufferImpl.cpp

@@ -98,22 +98,22 @@ int32 FSGHapticGloveCommandBufferImpl::GetMaxThumpCommands()
 
 FSGHapticGloveCommandBufferImpl::FSGHapticGloveCommandBufferImpl()
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
 }
 
 FSGHapticGloveCommandBufferImpl::FSGHapticGloveCommandBufferImpl(
     const FHapticGloveCommandBufferType& HapticGloveCommandBuffer)
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     Pimpl->HapticGloveCommandBuffer = HapticGloveCommandBuffer;
 }
@@ -121,20 +121,20 @@ FSGHapticGloveCommandBufferImpl::FSGHapticGloveCommandBufferImpl(
 FSGHapticGloveCommandBufferImpl::FSGHapticGloveCommandBufferImpl(
     const FSGHapticGloveCommandBufferImpl& Rhs)
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{*Rhs.Pimpl}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{*Rhs.Pimpl}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     Pimpl->Owner = this;
 }
 
 FSGHapticGloveCommandBufferImpl::FSGHapticGloveCommandBufferImpl(
     FSGHapticGloveCommandBufferImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
     = default;
 
 FSGHapticGloveCommandBufferImpl::~FSGHapticGloveCommandBufferImpl() = default;
@@ -149,9 +149,9 @@ FSGHapticGloveCommandBufferImpl& FSGHapticGloveCommandBufferImpl::operator=(
 
 FSGHapticGloveCommandBufferImpl& FSGHapticGloveCommandBufferImpl::operator=(
     FSGHapticGloveCommandBufferImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
     = default;
 
 const FSGHapticGloveCommandBufferImpl::FHapticGloveCommandBufferType&

Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHapticGloveImpl.cpp

@@ -126,39 +126,39 @@ bool FSGHapticGloveImpl::GetGlove(const bool bRightHanded, TSharedPtr<FSGHapticG
 
 FSGHapticGloveImpl::FSGHapticGloveImpl()
     : FSGDeviceImpl(),
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
       Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
 }
 
 FSGHapticGloveImpl::FSGHapticGloveImpl(const FHapticGlovePtrType HapticGlove)
     : FSGDeviceImpl(std::dynamic_pointer_cast<FSGDeviceType>(HapticGlove)),
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
       Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
 }
 
 FSGHapticGloveImpl::FSGHapticGloveImpl(const FSGHapticGloveImpl& Rhs)
     : FSGDeviceImpl(Rhs),
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
       Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{*Rhs.Pimpl}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{*Rhs.Pimpl}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     Pimpl->Owner = this;
 }
 
 FSGHapticGloveImpl::FSGHapticGloveImpl(FSGHapticGloveImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
     = default;
 
 FSGHapticGloveImpl::~FSGHapticGloveImpl() = default;
@@ -172,9 +172,9 @@ FSGHapticGloveImpl& FSGHapticGloveImpl::operator=(const FSGHapticGloveImpl& Rhs)
 }
 
 FSGHapticGloveImpl& FSGHapticGloveImpl::operator=(FSGHapticGloveImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
     = default;
 
 FSGHapticGloveImpl::FHapticGlovePtrType FSGHapticGloveImpl::ToHapticGlovePtr() const

Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHapticGloveQuickCalibrationImpl.cpp

@@ -88,11 +88,11 @@ float FSGHapticGloveQuickCalibrationImpl::GetDefaultAutoEndTimeout()
 
 FSGHapticGloveQuickCalibrationImpl::FSGHapticGloveQuickCalibrationImpl()
     : FSGHapticGloveCalibrationSequenceImpl(),
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
       Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
 }
 
@@ -100,41 +100,41 @@ FSGHapticGloveQuickCalibrationImpl::FSGHapticGloveQuickCalibrationImpl(
     const TSharedRef<FSGHapticGloveImpl> GloveToCalibrate, const float AutoEndTimeout)
     : FSGHapticGloveCalibrationSequenceImpl(
           MakeShared<FHapticGloveQuickCalibrationType>(GloveToCalibrate->ToHapticGlovePtr(), AutoEndTimeout)),
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
       Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
 }
 
 FSGHapticGloveQuickCalibrationImpl::FSGHapticGloveQuickCalibrationImpl(
     const FHapticGloveQuickCalibrationType& HapticGloveQuickCalibration)
     : FSGHapticGloveCalibrationSequenceImpl(MakeShared<FHapticGloveQuickCalibrationType>(HapticGloveQuickCalibration)),
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
 }
 
 FSGHapticGloveQuickCalibrationImpl::FSGHapticGloveQuickCalibrationImpl(const FSGHapticGloveQuickCalibrationImpl& Rhs)
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{*Rhs.Pimpl}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{*Rhs.Pimpl}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     Pimpl->Owner = this;
 }
 
 FSGHapticGloveQuickCalibrationImpl::FSGHapticGloveQuickCalibrationImpl(
     FSGHapticGloveQuickCalibrationImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
     = default;
 
 FSGHapticGloveQuickCalibrationImpl::~FSGHapticGloveQuickCalibrationImpl() = default;
@@ -149,9 +149,9 @@ FSGHapticGloveQuickCalibrationImpl& FSGHapticGloveQuickCalibrationImpl::operator
 
 FSGHapticGloveQuickCalibrationImpl& FSGHapticGloveQuickCalibrationImpl::operator=(
     FSGHapticGloveQuickCalibrationImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
     = default;
 
 const FSGHapticGloveQuickCalibrationImpl::FHapticGloveQuickCalibrationType&

Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGInterpolationSetImpl.cpp

@@ -82,21 +82,21 @@ FSGInterpolationSetImpl FSGInterpolationSetImpl::Deserialize(const FString& Seri
 
 FSGInterpolationSetImpl::FSGInterpolationSetImpl()
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
 }
 
 FSGInterpolationSetImpl::FSGInterpolationSetImpl(const float From1, const float From2, const float To1, const float To2)
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     Pimpl->InterpolationSet = FInterpolationSetType(From1, From2, To1, To2);
 }
@@ -104,41 +104,41 @@ FSGInterpolationSetImpl::FSGInterpolationSetImpl(const float From1, const float
 FSGInterpolationSetImpl::FSGInterpolationSetImpl(const float From1, const float From2, const float To1, const float To2,
                                                  const float Min, const float Max)
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     Pimpl->InterpolationSet = FInterpolationSetType(From1, From2, To1, To2, Min, Max);
 }
 
 FSGInterpolationSetImpl::FSGInterpolationSetImpl(const FInterpolationSetType& InterpolationSet)
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     Pimpl->InterpolationSet = InterpolationSet;
 }
 
 FSGInterpolationSetImpl::FSGInterpolationSetImpl(const FSGInterpolationSetImpl& Rhs)
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{*Rhs.Pimpl}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{*Rhs.Pimpl}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     Pimpl->Owner = this;
 }
 
 FSGInterpolationSetImpl::FSGInterpolationSetImpl(FSGInterpolationSetImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
     = default;
 
 FSGInterpolationSetImpl::~FSGInterpolationSetImpl() = default;
@@ -151,9 +151,9 @@ FSGInterpolationSetImpl& FSGInterpolationSetImpl::operator=(const FSGInterpolati
 }
 
 FSGInterpolationSetImpl& FSGInterpolationSetImpl::operator=(FSGInterpolationSetImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
     = default;
 
 const FSGInterpolationSetImpl::FInterpolationSetType& FSGInterpolationSetImpl::ToInterpolationSet() const

Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGNovaGloveHandProfileImpl.cpp

@@ -90,51 +90,51 @@ FSGNovaGloveHandProfileImpl FSGNovaGloveHandProfileImpl::Deserialize(const FStri
 
 FSGNovaGloveHandProfileImpl::FSGNovaGloveHandProfileImpl()
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
 }
 
 FSGNovaGloveHandProfileImpl::FSGNovaGloveHandProfileImpl(bool bRightHanded, const FSGHandInterpolatorImpl& Interpolator)
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     Pimpl->NovaGloveHandProfile = FNovaGloveHandProfileType(bRightHanded, Interpolator.ToHandInterpolator());
 }
 
 FSGNovaGloveHandProfileImpl::FSGNovaGloveHandProfileImpl(const FNovaGloveHandProfileType& NovaGloveHandProfile)
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     Pimpl->NovaGloveHandProfile = NovaGloveHandProfile;
 }
 
 FSGNovaGloveHandProfileImpl::FSGNovaGloveHandProfileImpl(const FSGNovaGloveHandProfileImpl& Rhs)
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{*Rhs.Pimpl}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{*Rhs.Pimpl}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     Pimpl->Owner = this;
 }
 
 FSGNovaGloveHandProfileImpl::FSGNovaGloveHandProfileImpl(FSGNovaGloveHandProfileImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
     = default;
 
 FSGNovaGloveHandProfileImpl::~FSGNovaGloveHandProfileImpl() = default;
@@ -147,9 +147,9 @@ FSGNovaGloveHandProfileImpl& FSGNovaGloveHandProfileImpl::operator=(const FSGNov
 }
 
 FSGNovaGloveHandProfileImpl& FSGNovaGloveHandProfileImpl::operator=(FSGNovaGloveHandProfileImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 = default;
 
 const FSGNovaGloveHandProfileImpl::FNovaGloveHandProfileType& FSGNovaGloveHandProfileImpl::ToNovaGloveHandProfile(

Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGNovaGloveImpl.cpp

@@ -238,59 +238,59 @@ FString FSGNovaGloveImpl::ToBytes(const FSGBuzzCommandImpl& BuzzCommand)
 
 FSGNovaGloveImpl::FSGNovaGloveImpl()
     : FSGHapticGloveImpl(),
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
       Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
       Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
 }
 
 FSGNovaGloveImpl::FSGNovaGloveImpl(const FSGNovaGloveInfoImpl& DeviceInfo)
     : FSGHapticGloveImpl(FSGNovaGloveImpl(std::make_shared<FNovaGloveType>((DeviceInfo.ToNovaGloveInfo())))),
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
       Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
       Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
 }
 
 FSGNovaGloveImpl::FSGNovaGloveImpl(const FNovaGloveType NovaGlove)
     : FSGHapticGloveImpl(std::make_shared<FNovaGloveType>(NovaGlove)),
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
       Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
       Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
 }
 
 FSGNovaGloveImpl::FSGNovaGloveImpl(const FNovaGlovePtrType NovaGlove)
     : FSGHapticGloveImpl(NovaGlove),
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
       Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
       Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
 }
 
 FSGNovaGloveImpl::FSGNovaGloveImpl(const FSGNovaGloveImpl& Rhs)
     : FSGHapticGloveImpl(Rhs),
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
       Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{*Rhs.Pimpl}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{*Rhs.Pimpl}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     Pimpl->Owner = this;
 }
 
 FSGNovaGloveImpl::FSGNovaGloveImpl(FSGNovaGloveImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
     = default;
 
 FSGNovaGloveImpl::~FSGNovaGloveImpl() = default;
@@ -304,9 +304,9 @@ FSGNovaGloveImpl& FSGNovaGloveImpl::operator=(const FSGNovaGloveImpl& Rhs)
 }
 
 FSGNovaGloveImpl& FSGNovaGloveImpl::operator=(FSGNovaGloveImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
     = default;
 
 const FSGNovaGloveImpl::FNovaGloveType& FSGNovaGloveImpl::ToNovaGlove() const

Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGNovaGloveInfoImpl.cpp

@@ -95,11 +95,11 @@ FSGNovaGloveInfoImpl FSGNovaGloveInfoImpl::Deserialize(const FString& Serialized
 
 FSGNovaGloveInfoImpl::FSGNovaGloveInfoImpl()
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
 }
 
@@ -108,11 +108,11 @@ FSGNovaGloveInfoImpl::FSGNovaGloveInfoImpl(
     const FString& HardwareVersion, const int32 FirmwareVersion, const int32 SubFirmwareVersion,
     const bool bRightHanded, const FQuat& ImuCorrection, const int32 NumberOfSensors)
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     std::string DeviceIdString(TCHAR_TO_UTF8(*DeviceId));
     std::string HardwareVersionString(TCHAR_TO_UTF8(*HardwareVersion));
@@ -125,30 +125,30 @@ FSGNovaGloveInfoImpl::FSGNovaGloveInfoImpl(
 
 FSGNovaGloveInfoImpl::FSGNovaGloveInfoImpl(const FNovaGloveInfoType& GloveInfo)
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     Pimpl->NovaGloveInfo = GloveInfo;
 }
 
 FSGNovaGloveInfoImpl::FSGNovaGloveInfoImpl(const FSGNovaGloveInfoImpl& Rhs)
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{*Rhs.Pimpl}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{*Rhs.Pimpl}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     Pimpl->Owner = this;
 }
 
 FSGNovaGloveInfoImpl::FSGNovaGloveInfoImpl(FSGNovaGloveInfoImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
     = default;
 
 FSGNovaGloveInfoImpl::~FSGNovaGloveInfoImpl() = default;
@@ -161,9 +161,9 @@ FSGNovaGloveInfoImpl& FSGNovaGloveInfoImpl::operator=(const FSGNovaGloveInfoImpl
 }
 
 FSGNovaGloveInfoImpl& FSGNovaGloveInfoImpl::operator=(FSGNovaGloveInfoImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
     = default;
 
 const FSGNovaGloveInfoImpl::FNovaGloveInfoType& FSGNovaGloveInfoImpl::ToNovaGloveInfo() const

Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGNovaGloveSensorDataImpl.cpp

@@ -102,11 +102,11 @@ FSGNovaGloveSensorDataImpl FSGNovaGloveSensorDataImpl::Deserialize(const FString
 
 FSGNovaGloveSensorDataImpl::FSGNovaGloveSensorDataImpl()
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
 }
 
@@ -114,11 +114,11 @@ FSGNovaGloveSensorDataImpl::FSGNovaGloveSensorDataImpl(const TArray<FVector>& Va
                                                        const FQuat& ImuRotation, const bool bImuParsed,
                                                        const float BatteryLevel, const bool bCharging)
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     std::vector<FSGVect3DImpl::FVect3DType> ValuesVector{
         FSGArrayUtils::ToStdVector<FVector, FSGVect3DImpl::FVect3DType, FSGVect3DImpl, &FSGVect3DImpl::ToVect3D>(
@@ -131,30 +131,30 @@ FSGNovaGloveSensorDataImpl::FSGNovaGloveSensorDataImpl(const TArray<FVector>& Va
 
 FSGNovaGloveSensorDataImpl::FSGNovaGloveSensorDataImpl(const FNovaGloveSensorDataType& NovaGloveSensorData)
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     Pimpl->NovaGloveSensorData = NovaGloveSensorData;
 }
 
 FSGNovaGloveSensorDataImpl::FSGNovaGloveSensorDataImpl(const FSGNovaGloveSensorDataImpl& Rhs)
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{*Rhs.Pimpl}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{*Rhs.Pimpl}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     Pimpl->Owner = this;
 }
 
 FSGNovaGloveSensorDataImpl::FSGNovaGloveSensorDataImpl(FSGNovaGloveSensorDataImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
     = default;
 
 FSGNovaGloveSensorDataImpl::~FSGNovaGloveSensorDataImpl() = default;
@@ -168,9 +168,9 @@ FSGNovaGloveSensorDataImpl& FSGNovaGloveSensorDataImpl::operator=(const FSGNovaG
 
 FSGNovaGloveSensorDataImpl& FSGNovaGloveSensorDataImpl::operator=(FSGNovaGloveSensorDataImpl&& Rhs
     )
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
     = default;
 
 const FSGNovaGloveSensorDataImpl::FNovaGloveSensorDataType& FSGNovaGloveSensorDataImpl::ToNovaGloveSensorData(

Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGPlatform.cpp

@@ -1,36 +0,0 @@
-/**
- * @file
- *
- * @author  Mamadou Babaei <mamadou@senseglove.com>
- *
- * @section LICENSE
- *
- * (The MIT License)
- *
- * Copyright (c) 2020 - 2022 SenseGlove
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * @section DESCRIPTION
- *
- *
- */
-
-
-#include "SGCoreImpl/SGPlatform.h"

Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGQuatImpl.cpp

@@ -127,43 +127,43 @@ bool FSGQuatImpl::Deserialize(const FString& String, FSGQuatImpl& OutResult, con
 
 FSGQuatImpl::FSGQuatImpl()
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
 }
 
 FSGQuatImpl::FSGQuatImpl(const float X, const float Y, const float Z, const float W)
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     Pimpl->Quat = FQuatType(X, Y, Z, W);
 }
 
 FSGQuatImpl::FSGQuatImpl(const FQuatType& Quat)
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     Pimpl->Quat = Quat;
 }
 
 FSGQuatImpl::FSGQuatImpl(const FQuat& Quat)
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     /// NOTE
     /// Unreal Engine uses a left-handed, z-up world coordinate system, which yealds clockwise rotations:
@@ -179,19 +179,19 @@ FSGQuatImpl::FSGQuatImpl(const FQuat& Quat)
 
 FSGQuatImpl::FSGQuatImpl(const FSGQuatImpl& Rhs)
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{*Rhs.Pimpl}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{*Rhs.Pimpl}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     Pimpl->Owner = this;
 }
 
 FSGQuatImpl::FSGQuatImpl(FSGQuatImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
     = default;
 
 FSGQuatImpl::~FSGQuatImpl() = default;
@@ -204,9 +204,9 @@ FSGQuatImpl& FSGQuatImpl::operator=(const FSGQuatImpl& Rhs)
 }
 
 FSGQuatImpl& FSGQuatImpl::operator=(FSGQuatImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
     = default;
 
 const FSGQuatImpl::FQuatType& FSGQuatImpl::ToQuat() const

Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGQuatImpl.h

@@ -41,8 +41,6 @@
 #include "Runtime/Launch/Resources/Version.h"
 #include "Templates/UniquePtr.h"
 
-#include "SGCoreImpl/SGPlatform.h"
-
 class FSGVect3DImpl;
 
 namespace SGCore
@@ -109,9 +107,9 @@ public:
      * The move constructor.
      */
     FSGQuatImpl(FSGQuatImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
         noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
         ;
 
 public:
@@ -130,9 +128,9 @@ public:
      * The move assignment operator.
      */
     FSGQuatImpl& operator=(FSGQuatImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
         noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
         ;
 
 public:

Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGSenseGloveHandProfileImpl.cpp

@@ -100,11 +100,11 @@ const FVector& FSGSenseGloveHandProfileImpl::GetDefaultThimbleOffset()
 
 FSGSenseGloveHandProfileImpl::FSGSenseGloveHandProfileImpl()
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
 }
 
@@ -114,11 +114,11 @@ FSGSenseGloveHandProfileImpl::FSGSenseGloveHandProfileImpl(const bool bRightHand
                                                            const ESGFingerSolver FingerSolver,
                                                            const TArray<FVector>& FingerThimbleOffset)
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     std::vector<FSGVect3DImpl::FVect3DType> FingerThimbleOffsetVector{
         FSGArrayUtils::ToMillimeters<FSGVect3DImpl::FVect3DType, FSGVect3DImpl>(FingerThimbleOffset)
@@ -132,30 +132,30 @@ FSGSenseGloveHandProfileImpl::FSGSenseGloveHandProfileImpl(const bool bRightHand
 
 FSGSenseGloveHandProfileImpl::FSGSenseGloveHandProfileImpl(const FSenseGloveHandProfileType& SenseGloveHandProfile)
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     Pimpl->SenseGloveHandProfile = SenseGloveHandProfile;
 }
 
 FSGSenseGloveHandProfileImpl::FSGSenseGloveHandProfileImpl(const FSGSenseGloveHandProfileImpl& Rhs)
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{*Rhs.Pimpl}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{*Rhs.Pimpl}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     Pimpl->Owner = this;
 }
 
 FSGSenseGloveHandProfileImpl::FSGSenseGloveHandProfileImpl(FSGSenseGloveHandProfileImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
     = default;
 
 FSGSenseGloveHandProfileImpl::~FSGSenseGloveHandProfileImpl() = default;
@@ -168,9 +168,9 @@ FSGSenseGloveHandProfileImpl& FSGSenseGloveHandProfileImpl::operator=(const FSGS
 }
 
 FSGSenseGloveHandProfileImpl& FSGSenseGloveHandProfileImpl::operator=(FSGSenseGloveHandProfileImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 = default;
 
 const FSGSenseGloveHandProfileImpl::FSenseGloveHandProfileType& FSGSenseGloveHandProfileImpl::ToSenseGloveHandProfile(

Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGSenseGloveImpl.cpp

@@ -248,59 +248,59 @@ void FSGSenseGloveImpl::CalculateWristLocation(const FVector& ReferencePosition,
 
 FSGSenseGloveImpl::FSGSenseGloveImpl()
     : FSGHapticGloveImpl(),
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
       Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
       Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
 }
 
 FSGSenseGloveImpl::FSGSenseGloveImpl(const FSGSenseGloveInfoImpl& Model)
     : FSGHapticGloveImpl(std::make_shared<FSenseGloveType>(Model.ToSenseGloveInfo())),
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
       Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
       Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
 }
 
 FSGSenseGloveImpl::FSGSenseGloveImpl(const FSenseGloveType SenseGlove)
     : FSGHapticGloveImpl(std::make_shared<FSenseGloveType>(SenseGlove)),
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
       Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
       Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
 }
 
 FSGSenseGloveImpl::FSGSenseGloveImpl(const FSenseGlovePtrType SenseGlove)
     : FSGHapticGloveImpl(std::dynamic_pointer_cast<FHapticGloveType>(SenseGlove)),
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
       Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
       Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
 }
 
 FSGSenseGloveImpl::FSGSenseGloveImpl(const FSGSenseGloveImpl& Rhs)
     : FSGHapticGloveImpl(Rhs),
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
       Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{*Rhs.Pimpl}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{*Rhs.Pimpl}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     Pimpl->Owner = this;
 }
 
 FSGSenseGloveImpl::FSGSenseGloveImpl(FSGSenseGloveImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
     = default;
 
 FSGSenseGloveImpl::~FSGSenseGloveImpl() = default;
@@ -314,9 +314,9 @@ FSGSenseGloveImpl& FSGSenseGloveImpl::operator=(const FSGSenseGloveImpl& Rhs)
 }
 
 FSGSenseGloveImpl& FSGSenseGloveImpl::operator=(FSGSenseGloveImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
     = default;
 
 const FSGSenseGloveImpl::FSenseGloveType& FSGSenseGloveImpl::ToSenseGlove() const

Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGSenseGloveInfoImpl.cpp

@@ -99,11 +99,11 @@ FSGSenseGloveInfoImpl FSGSenseGloveInfoImpl::Deserialize(const FString& Serializ
 
 FSGSenseGloveInfoImpl::FSGSenseGloveInfoImpl()
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
 }
 
@@ -117,11 +117,11 @@ FSGSenseGloveInfoImpl::FSGSenseGloveInfoImpl(const FString& DeviceId,
                                              const TArray<TArray<FVector>>& GloveLengths,
                                              const TArray<bool>& Functions)
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     std::string DeviceIdString(TCHAR_TO_UTF8(*DeviceId));
     std::string HardwareVersionString(TCHAR_TO_UTF8(*HardwareVersion));
@@ -151,30 +151,30 @@ FSGSenseGloveInfoImpl::FSGSenseGloveInfoImpl(const FString& DeviceId,
 
 FSGSenseGloveInfoImpl::FSGSenseGloveInfoImpl(const FSenseGloveInfoType& GloveInfo)
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     Pimpl->SenseGloveInfo = GloveInfo;
 }
 
 FSGSenseGloveInfoImpl::FSGSenseGloveInfoImpl(const FSGSenseGloveInfoImpl& Rhs)
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{*Rhs.Pimpl}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{*Rhs.Pimpl}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     Pimpl->Owner = this;
 }
 
 FSGSenseGloveInfoImpl::FSGSenseGloveInfoImpl(FSGSenseGloveInfoImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
     = default;
 
 FSGSenseGloveInfoImpl::~FSGSenseGloveInfoImpl() = default;
@@ -187,9 +187,9 @@ FSGSenseGloveInfoImpl& FSGSenseGloveInfoImpl::operator=(const FSGSenseGloveInfoI
 }
 
 FSGSenseGloveInfoImpl& FSGSenseGloveInfoImpl::operator=(FSGSenseGloveInfoImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
     = default;
 
 const FSGSenseGloveInfoImpl::FSenseGloveInfoType& FSGSenseGloveInfoImpl::ToSenseGloveInfo() const

Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGSenseGlovePoseImpl.cpp

@@ -94,11 +94,11 @@ FSGSenseGlovePoseImpl FSGSenseGlovePoseImpl::Deserialize(const FString& Serializ
 
 FSGSenseGlovePoseImpl::FSGSenseGlovePoseImpl()
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
 }
 
@@ -106,11 +106,11 @@ FSGSenseGlovePoseImpl::FSGSenseGlovePoseImpl(const bool bRightHanded, const TArr
                                              const TArray<TArray<FQuat>>& JointRotations,
                                              const TArray<TArray<FVector>>& GloveAngles)
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     std::vector<std::vector<FSGVect3DImpl::FVect3DType>> JointPositionsVector{
         FSGArrayUtils::ToMillimeters<FSGVect3DImpl::FVect3DType, FSGVect3DImpl>(JointPositions)
@@ -130,30 +130,30 @@ FSGSenseGlovePoseImpl::FSGSenseGlovePoseImpl(const bool bRightHanded, const TArr
 
 FSGSenseGlovePoseImpl::FSGSenseGlovePoseImpl(const FSenseGlovePoseType& SenseGlovePose)
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     Pimpl->SenseGlovePose = SenseGlovePose;
 }
 
 FSGSenseGlovePoseImpl::FSGSenseGlovePoseImpl(const FSGSenseGlovePoseImpl& Rhs)
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{*Rhs.Pimpl}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{*Rhs.Pimpl}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     Pimpl->Owner = this;
 }
 
 FSGSenseGlovePoseImpl::FSGSenseGlovePoseImpl(FSGSenseGlovePoseImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
     = default;
 
 FSGSenseGlovePoseImpl::~FSGSenseGlovePoseImpl() = default;
@@ -166,9 +166,9 @@ FSGSenseGlovePoseImpl& FSGSenseGlovePoseImpl::operator=(const FSGSenseGlovePoseI
 }
 
 FSGSenseGlovePoseImpl& FSGSenseGlovePoseImpl::operator=(FSGSenseGlovePoseImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
     = default;
 
 const FSGSenseGlovePoseImpl::FSenseGlovePoseType& FSGSenseGlovePoseImpl::ToSenseGlovePose() const

Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGSenseGloveSensorDataImpl.cpp

@@ -101,11 +101,11 @@ FSGSenseGloveSensorDataImpl FSGSenseGloveSensorDataImpl::Deserialize(const FStri
 
 FSGSenseGloveSensorDataImpl::FSGSenseGloveSensorDataImpl()
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
 }
 
@@ -113,11 +113,11 @@ FSGSenseGloveSensorDataImpl::FSGSenseGloveSensorDataImpl(const TArray<TArray<flo
                                                          const FQuat& ImuRotation,
                                                          const int32 ParsedValues, const bool bImuParsed)
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     std::vector<std::vector<float>> SensorAnglesVector{FSGArrayUtils::ToStdVector<float>(SensorAngles)};
     Pimpl->SenseGloveSensorData = FSenseGloveSensorDataType(
@@ -126,30 +126,30 @@ FSGSenseGloveSensorDataImpl::FSGSenseGloveSensorDataImpl(const TArray<TArray<flo
 
 FSGSenseGloveSensorDataImpl::FSGSenseGloveSensorDataImpl(const FSenseGloveSensorDataType& SenseGloveSensorData)
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     Pimpl->SenseGloveSensorData = SenseGloveSensorData;
 }
 
 FSGSenseGloveSensorDataImpl::FSGSenseGloveSensorDataImpl(const FSGSenseGloveSensorDataImpl& Rhs)
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{*Rhs.Pimpl}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{*Rhs.Pimpl}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     Pimpl->Owner = this;
 }
 
 FSGSenseGloveSensorDataImpl::FSGSenseGloveSensorDataImpl(FSGSenseGloveSensorDataImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
     = default;
 
 FSGSenseGloveSensorDataImpl::~FSGSenseGloveSensorDataImpl() = default;
@@ -163,9 +163,9 @@ FSGSenseGloveSensorDataImpl& FSGSenseGloveSensorDataImpl::operator=(const FSGSen
 
 FSGSenseGloveSensorDataImpl& FSGSenseGloveSensorDataImpl::operator=(FSGSenseGloveSensorDataImpl&& Rhs
     )
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
     = default;
 
 const FSGSenseGloveSensorDataImpl::FSenseGloveSensorDataType& FSGSenseGloveSensorDataImpl::ToSenseGloveSensorData(

Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGSensorRangeImpl.cpp

@@ -106,21 +106,21 @@ void FSGSensorRangeImpl::CheckMin(const FVector& CurrentValues, FVector& OutMinV
 
 FSGSensorRangeImpl::FSGSensorRangeImpl()
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
 }
 
 FSGSensorRangeImpl::FSGSensorRangeImpl(const TArray<FVector>& MinValues, const TArray<FVector>& MaxValues)
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     std::vector<FSGVect3DImpl::FVect3DType> MinValuesVector(
         FSGArrayUtils::ToStdVector<FVector, FSGVect3DImpl::FVect3DType, FSGVect3DImpl, &FSGVect3DImpl::ToVect3D>(
@@ -133,30 +133,30 @@ FSGSensorRangeImpl::FSGSensorRangeImpl(const TArray<FVector>& MinValues, const T
 
 FSGSensorRangeImpl::FSGSensorRangeImpl(const FSensorRangeType& SensorRange)
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     Pimpl->SensorRange = SensorRange;
 }
 
 FSGSensorRangeImpl::FSGSensorRangeImpl(const FSGSensorRangeImpl& Rhs)
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{*Rhs.Pimpl}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{*Rhs.Pimpl}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     Pimpl->Owner = this;
 }
 
 FSGSensorRangeImpl::FSGSensorRangeImpl(FSGSensorRangeImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
     = default;
 
 FSGSensorRangeImpl::~FSGSensorRangeImpl() = default;
@@ -169,9 +169,9 @@ FSGSensorRangeImpl& FSGSensorRangeImpl::operator=(const FSGSensorRangeImpl& Rhs)
 }
 
 FSGSensorRangeImpl& FSGSensorRangeImpl::operator=(FSGSensorRangeImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
     = default;
 
 const FSGSensorRangeImpl::FSensorRangeType& FSGSensorRangeImpl::ToSensorRange() const

Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGThumperCommandImpl.cpp

@@ -76,51 +76,51 @@ const FSGThumperCommandImpl& FSGThumperCommandImpl::Off()
 
 FSGThumperCommandImpl::FSGThumperCommandImpl()
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
 }
 
 FSGThumperCommandImpl::FSGThumperCommandImpl(const int32 Magnitude)
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     Pimpl->ThumperCommand = FThumperCommandType(Magnitude);
 }
 
 FSGThumperCommandImpl::FSGThumperCommandImpl(const FThumperCommandType& ThumperCommand)
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     Pimpl->ThumperCommand = ThumperCommand;
 }
 
 FSGThumperCommandImpl::FSGThumperCommandImpl(const FSGThumperCommandImpl& Rhs)
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{*Rhs.Pimpl}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{*Rhs.Pimpl}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     Pimpl->Owner = this;
 }
 
 FSGThumperCommandImpl::FSGThumperCommandImpl(FSGThumperCommandImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
     = default;
 
 FSGThumperCommandImpl::~FSGThumperCommandImpl() = default;
@@ -133,9 +133,9 @@ FSGThumperCommandImpl& FSGThumperCommandImpl::operator=(const FSGThumperCommandI
 }
 
 FSGThumperCommandImpl& FSGThumperCommandImpl::operator=(FSGThumperCommandImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
     = default;
 
 const FSGThumperCommandImpl::FThumperCommandType& FSGThumperCommandImpl::ToThumperCommand() const

Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGTimedBuzzCommandImpl.cpp

@@ -69,11 +69,11 @@ struct FSGTimedBuzzCommandImpl::FImpl
 
 FSGTimedBuzzCommandImpl::FSGTimedBuzzCommandImpl()
     : FSGBuzzCommandImpl(MakeShared<FTimedBuzzCommandType>()),
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
 }
 
@@ -81,11 +81,11 @@ FSGTimedBuzzCommandImpl::FSGTimedBuzzCommandImpl(const ESGFinger Finger, const i
                                                  const float DurationSeconds, const float StartTimeSeconds)
     : FSGBuzzCommandImpl(MakeShared<FTimedBuzzCommandType>(FSGCoreEnumCast::ToEFinger(Finger), Magnitude,
                                                            DurationSeconds, StartTimeSeconds)),
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
 }
 
@@ -93,49 +93,49 @@ FSGTimedBuzzCommandImpl::FSGTimedBuzzCommandImpl(const FSGBuzzCommandImpl& BaseC
                                                  const float DurationSeconds, const float StartTimeSeconds)
     : FSGBuzzCommandImpl(MakeShared<FTimedBuzzCommandType>(
         BaseCommand.ToBuzzCommand(), DurationSeconds, StartTimeSeconds)),
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
 }
 
 FSGTimedBuzzCommandImpl::FSGTimedBuzzCommandImpl(const FTimedBuzzCommandType& TimedBuzzCommand)
     : FSGBuzzCommandImpl(MakeShared<FTimedBuzzCommandType>(TimedBuzzCommand)),
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
 }
 
 FSGTimedBuzzCommandImpl::FSGTimedBuzzCommandImpl(const TSharedRef<FTimedBuzzCommandType> TimedBuzzCommand)
     : FSGBuzzCommandImpl(TimedBuzzCommand),
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
 }
 
 FSGTimedBuzzCommandImpl::FSGTimedBuzzCommandImpl(const FSGTimedBuzzCommandImpl& Rhs)
     : FSGBuzzCommandImpl(Rhs),
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{*Rhs.Pimpl}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{*Rhs.Pimpl}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     Pimpl->Owner = this;
 }
 
 FSGTimedBuzzCommandImpl::FSGTimedBuzzCommandImpl(FSGTimedBuzzCommandImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
     = default;
 
 FSGTimedBuzzCommandImpl::~FSGTimedBuzzCommandImpl() = default;
@@ -149,9 +149,9 @@ FSGTimedBuzzCommandImpl& FSGTimedBuzzCommandImpl::operator=(const FSGTimedBuzzCo
 }
 
 FSGTimedBuzzCommandImpl& FSGTimedBuzzCommandImpl::operator=(FSGTimedBuzzCommandImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
     = default;
 
 const FSGTimedBuzzCommandImpl::FTimedBuzzCommandType& FSGTimedBuzzCommandImpl::ToTimedBuzzCommand() const

Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGTimedThumpCommandImpl.cpp

@@ -72,22 +72,22 @@ struct FSGTimedThumpCommandImpl::FImpl
 
 FSGTimedThumpCommandImpl::FSGTimedThumpCommandImpl()
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
 }
 
 FSGTimedThumpCommandImpl::FSGTimedThumpCommandImpl(const int32 Magnitude,
                                                    const float DurationSeconds, const float StartTimeSeconds)
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     Pimpl->TimedThumpCommand = FTimedThumpCommandType(Magnitude, DurationSeconds, StartTimeSeconds);
 }
@@ -95,11 +95,11 @@ FSGTimedThumpCommandImpl::FSGTimedThumpCommandImpl(const int32 Magnitude,
 FSGTimedThumpCommandImpl::FSGTimedThumpCommandImpl(const FSGThumperCommandImpl& BaseCommand,
                                                    const float DurationSeconds, const float StartTimeSeconds)
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     Pimpl->TimedThumpCommand = FTimedThumpCommandType(BaseCommand.ToThumperCommand(), DurationSeconds,
                                                       StartTimeSeconds);
@@ -107,30 +107,30 @@ FSGTimedThumpCommandImpl::FSGTimedThumpCommandImpl(const FSGThumperCommandImpl&
 
 FSGTimedThumpCommandImpl::FSGTimedThumpCommandImpl(const FTimedThumpCommandType& SGTimedThumpCommand)
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     Pimpl->TimedThumpCommand = SGTimedThumpCommand;
 }
 
 FSGTimedThumpCommandImpl::FSGTimedThumpCommandImpl(const FSGTimedThumpCommandImpl& Rhs)
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{*Rhs.Pimpl}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{*Rhs.Pimpl}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     Pimpl->Owner = this;
 }
 
 FSGTimedThumpCommandImpl::FSGTimedThumpCommandImpl(FSGTimedThumpCommandImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
     = default;
 
 FSGTimedThumpCommandImpl::~FSGTimedThumpCommandImpl() = default;
@@ -143,9 +143,9 @@ FSGTimedThumpCommandImpl& FSGTimedThumpCommandImpl::operator=(const FSGTimedThum
 }
 
 FSGTimedThumpCommandImpl& FSGTimedThumpCommandImpl::operator=(FSGTimedThumpCommandImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
     = default;
 
 const FSGTimedThumpCommandImpl::FTimedThumpCommandType& FSGTimedThumpCommandImpl::ToTimedThumpCommand() const

Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGVect3DImpl.cpp

@@ -85,43 +85,43 @@ bool FSGVect3DImpl::Deserialize(const FString& String, FSGVect3DImpl& OutResult,
 
 FSGVect3DImpl::FSGVect3DImpl()
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
 }
 
 FSGVect3DImpl::FSGVect3DImpl(const float X, const float Y, const float Z)
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     Pimpl->Vect3D = FVect3DType(X, Y, Z);
 }
 
 FSGVect3DImpl::FSGVect3DImpl(const FVect3DType& Vect3D)
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     Pimpl->Vect3D = Vect3D;
 }
 
 FSGVect3DImpl::FSGVect3DImpl(const FVector& Vector)
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     /// NOTE
     /// Unreal Engine uses a left-handed, z-up world coordinate system, which yealds clockwise rotations:
@@ -139,19 +139,19 @@ FSGVect3DImpl::FSGVect3DImpl(const FVector& Vector)
 
 FSGVect3DImpl::FSGVect3DImpl(const FSGVect3DImpl& Rhs)
     :
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{*Rhs.Pimpl}, PimplDeleter))
 #else
     Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{*Rhs.Pimpl}))
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     Pimpl->Owner = this;
 }
 
 FSGVect3DImpl::FSGVect3DImpl(FSGVect3DImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
     = default;
 
 FSGVect3DImpl::~FSGVect3DImpl() = default;
@@ -164,9 +164,9 @@ FSGVect3DImpl& FSGVect3DImpl::operator=(const FSGVect3DImpl& Rhs)
 }
 
 FSGVect3DImpl& FSGVect3DImpl::operator=(FSGVect3DImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
     noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
     = default;
 
 const FSGVect3DImpl::FVect3DType& FSGVect3DImpl::ToVect3D() const

Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGVect3DImpl.h

@@ -40,8 +40,6 @@
 #include "Runtime/Launch/Resources/Version.h"
 #include "Templates/UniquePtr.h"
 
-#include "SGCoreImpl/SGPlatform.h"
-
 namespace SGCore
 {
     namespace Kinematics
@@ -109,9 +107,9 @@ public:
      * The move constructor.
      */
     FSGVect3DImpl(FSGVect3DImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
         noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
         ;
 
 public:
@@ -130,9 +128,9 @@ public:
      * The move assignment operator.
      */
     FSGVect3DImpl& operator=(FSGVect3DImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
         noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
         ;
 
 public:

Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGBasicHandModelImpl.h

@@ -41,7 +41,6 @@
 #include "Runtime/Launch/Resources/Version.h"
 #include "Templates/UniquePtr.h"
 
-#include "SGCoreImpl/SGPlatform.h"
 #include "SGTypes/SGCoreTypes.h"
 
 namespace SGCore
@@ -105,9 +104,9 @@ public:
      * The move constructor.
      */
     FSGBasicHandModelImpl(FSGBasicHandModelImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
         noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
         ;
 
 public:
@@ -126,9 +125,9 @@ public:
      * The move assignment operator.
      */
     FSGBasicHandModelImpl& operator=(FSGBasicHandModelImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
         noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
         ;
 
 public:

Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGBetaDeviceImpl.h

@@ -44,7 +44,6 @@
 #include "Templates/UniquePtr.h"
 
 #include "SGCoreImpl/SGDeviceImpl.h"
-#include "SGCoreImpl/SGPlatform.h"
 #include "SGTypes/SGCoreTypes.h"
 
 namespace SGCore
@@ -107,9 +106,9 @@ public:
      * The move constructor.
      */
     FSGBetaDeviceImpl(FSGBetaDeviceImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
         noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
         ;
 
 public:
@@ -128,9 +127,9 @@ public:
      * The move assignment operator.
      */
     FSGBetaDeviceImpl& operator=(FSGBetaDeviceImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
         noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
         ;
 
 public:

Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGBuzzCommandImpl.h

@@ -41,7 +41,6 @@
 #include "Templates/UniquePtr.h"
 
 #include "SGCoreImpl/SGFingerCommandImpl.h"
-#include "SGCoreImpl/SGPlatform.h"
 #include "SGTypes/SGCoreTypes.h"
 
 namespace SGCore
@@ -102,9 +101,9 @@ public:
      * The move constructor
      */
     FSGBuzzCommandImpl(FSGBuzzCommandImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
         noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
         ;
 
 public:
@@ -123,9 +122,9 @@ public:
      * The move assignment operator.
      */
     FSGBuzzCommandImpl& operator=(FSGBuzzCommandImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
         noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
         ;
 
 public:

Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGCalibrationDataPointImpl.h

@@ -39,8 +39,6 @@
 #include "Runtime/Launch/Resources/Version.h"
 #include "Templates/UniquePtr.h"
 
-#include "SGCoreImpl/SGPlatform.h"
-
 namespace SGCore
 {
     namespace Calibration
@@ -86,9 +84,9 @@ public:
      * The move constructor.
      */
     FSGCalibrationDataPointImpl(FSGCalibrationDataPointImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
         noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
         ;
 
 public:
@@ -107,9 +105,9 @@ public:
      * The move assignment operator.
      */
     FSGCalibrationDataPointImpl& operator=(FSGCalibrationDataPointImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
         noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
         ;
 
 public:

Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGDeviceImpl.h

@@ -42,7 +42,6 @@
 #include "Templates/SharedPointer.h"
 #include "Templates/UniquePtr.h"
 
-#include "SGCoreImpl/SGPlatform.h"
 #include "SGTypes/SGCoreTypes.h"
 
 namespace SGCore
@@ -98,9 +97,9 @@ public:
      * The move constructor.
      */
     FSGDeviceImpl(FSGDeviceImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
         noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
         ;
 
 public:
@@ -119,9 +118,9 @@ public:
      * The move assignment operator.
      */
     FSGDeviceImpl& operator=(FSGDeviceImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
         noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
         ;
 
 public:

Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGDeviceModelImpl.h

@@ -39,8 +39,6 @@
 #include "Runtime/Launch/Resources/Version.h"
 #include "Templates/UniquePtr.h"
 
-#include "SGCoreImpl/SGPlatform.h"
-
 namespace SGCore
 {
     class DeviceModel;
@@ -89,9 +87,9 @@ public:
      * The move constructor.
      */
     FSGDeviceModelImpl(FSGDeviceModelImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
         noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
         ;
 
 public:
@@ -110,9 +108,9 @@ public:
      * The move assignment operator.
      */
     FSGDeviceModelImpl& operator=(FSGDeviceModelImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
         noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
         ;
 
 public:

Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGFingerCommandImpl.h

@@ -41,8 +41,6 @@
 #include "Templates/SharedPointer.h"
 #include "Templates/UniquePtr.h"
 
-#include "SGCoreImpl/SGPlatform.h"
-
 namespace SGCore
 {
     namespace Haptics
@@ -97,9 +95,9 @@ public:
      * The move constructor
      */
     FSGFingerCommandImpl(FSGFingerCommandImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
         noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
         ;
 
 public:
@@ -118,9 +116,9 @@ public:
      * The move assignment operator.
      */
     FSGFingerCommandImpl& operator=(FSGFingerCommandImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
         noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
         ;
 
 public:

Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGForceFeedbackCommandImpl.h

@@ -41,7 +41,6 @@
 #include "Templates/UniquePtr.h"
 
 #include "SGCoreImpl/SGFingerCommandImpl.h"
-#include "SGCoreImpl/SGPlatform.h"
 #include "SGTypes/SGCoreTypes.h"
 
 namespace SGCore
@@ -102,9 +101,9 @@ public:
      * The move constructor
      */
     FSGForceFeedbackCommandImpl(FSGForceFeedbackCommandImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
         noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
         ;
 
 public:
@@ -123,9 +122,9 @@ public:
      * The move assignment operator.
      */
     FSGForceFeedbackCommandImpl& operator=(FSGForceFeedbackCommandImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
         noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
         ;
 
 public:

Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHandInterpolatorImpl.h

@@ -41,7 +41,6 @@
 #include "Runtime/Launch/Resources/Version.h"
 #include "Templates/UniquePtr.h"
 
-#include "SGCoreImpl/SGPlatform.h"
 #include "SGTypes/SGCoreTypes.h"
 
 class FSGInterpolationSetImpl;
@@ -109,9 +108,9 @@ public:
      * The move constructor.
      */
     FSGHandInterpolatorImpl(FSGHandInterpolatorImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
         noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
         ;
 
 public:
@@ -130,9 +129,9 @@ public:
      * The move assignment operator.
      */
     FSGHandInterpolatorImpl& operator=(FSGHandInterpolatorImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
         noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
         ;
 
 public:

Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHandPoseImpl.h

@@ -39,7 +39,6 @@
 #include "Runtime/Launch/Resources/Version.h"
 #include "Templates/UniquePtr.h"
 
-#include "SGCoreImpl/SGPlatform.h"
 #include "SGTypes/SGCoreTypes.h"
 
 class FSGHandInterpolatorImpl;
@@ -114,9 +113,9 @@ public:
      * The move constructor.
      */
     FSGHandPoseImpl(FSGHandPoseImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
         noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
         ;
 
 public:
@@ -135,9 +134,9 @@ public:
      * The move assignment operator.
      */
     FSGHandPoseImpl& operator=(FSGHandPoseImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
         noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
         ;
 
 public:

Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHandProfileImpl.h

@@ -39,8 +39,6 @@
 #include "Runtime/Launch/Resources/Version.h"
 #include "Templates/UniquePtr.h"
 
-#include "SGCoreImpl/SGPlatform.h"
-
 class FSGHandInterpolatorImpl;
 
 namespace SGCore
@@ -112,9 +110,9 @@ public:
      * The move constructor.
      */
     FSGHandProfileImpl(FSGHandProfileImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
         noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
         ;
 
 public:
@@ -133,9 +131,9 @@ public:
      * The move assignment operator.
      */
     FSGHandProfileImpl& operator=(FSGHandProfileImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
         noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
         ;
 
 public:

Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHapticGloveCalibrationCheckImpl.h

@@ -40,7 +40,6 @@
 #include "Runtime/Launch/Resources/Version.h"
 #include "Templates/UniquePtr.h"
 
-#include "SGCoreImpl/SGPlatform.h"
 #include "SGTypes/SGCoreTypes.h"
 
 namespace SGCore
@@ -115,9 +114,9 @@ public:
      * The move constructor.
      */
     FSGHapticGloveCalibrationCheckImpl(FSGHapticGloveCalibrationCheckImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
         noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
         ;
 
 public:
@@ -136,9 +135,9 @@ public:
      * The move assignment operator.
      */
     FSGHapticGloveCalibrationCheckImpl& operator=(FSGHapticGloveCalibrationCheckImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
         noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
         ;
 
 public:

Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHapticGloveCalibrationSequenceImpl.h

@@ -42,7 +42,7 @@
 #include "Templates/UniquePtr.h"
 
 #include "SGCoreImpl/SGHapticGloveCalibrationSequenceImpl.h"
-#include "SGCoreImpl/SGPlatform.h"
+
 #include "SGTypes/SGCoreTypes.h"
 
 namespace SGCore
@@ -112,9 +112,9 @@ public:
      * The move constructor.
      */
     FSGHapticGloveCalibrationSequenceImpl(FSGHapticGloveCalibrationSequenceImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
         noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
         ;
 
 public:
@@ -133,9 +133,9 @@ public:
      * The move assignment operator.
      */
     FSGHapticGloveCalibrationSequenceImpl& operator=(FSGHapticGloveCalibrationSequenceImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
         noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
         ;
 
 public:

Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHapticGloveCommandBufferImpl.h

@@ -39,7 +39,6 @@
 #include "Runtime/Launch/Resources/Version.h"
 #include "Templates/UniquePtr.h"
 
-#include "SGCoreImpl/SGPlatform.h"
 #include "SGTypes/SGCoreTypes.h"
 
 namespace SGCore
@@ -99,9 +98,9 @@ public:
      * The move constructor.
      */
     FSGHapticGloveCommandBufferImpl(FSGHapticGloveCommandBufferImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
         noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
         ;
 
 public:
@@ -120,9 +119,9 @@ public:
      * The move assignment operator.
      */
     FSGHapticGloveCommandBufferImpl& operator=(FSGHapticGloveCommandBufferImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
         noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
         ;
 
 public:

Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHapticGloveImpl.h

@@ -46,7 +46,6 @@
 #include "Templates/UniquePtr.h"
 
 #include "SGCoreImpl/SGDeviceImpl.h"
-#include "SGCoreImpl/SGPlatform.h"
 #include "SGTypes/SGCoreTypes.h"
 
 namespace SGCore
@@ -113,9 +112,9 @@ public:
      * The move constructor.
      */
     FSGHapticGloveImpl(FSGHapticGloveImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
         noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
         ;
 
 public:
@@ -134,9 +133,9 @@ public:
      * The move assignment operator.
      */
     FSGHapticGloveImpl& operator=(FSGHapticGloveImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
         noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
         ;
 
 public:

Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHapticGloveQuickCalibrationImpl.h

@@ -41,7 +41,6 @@
 #include "Templates/UniquePtr.h"
 
 #include "SGCoreImpl/SGHapticGloveCalibrationSequenceImpl.h"
-#include "SGCoreImpl/SGPlatform.h"
 
 namespace SGCore
 {
@@ -97,9 +96,9 @@ public:
      * The move constructor.
      */
     FSGHapticGloveQuickCalibrationImpl(FSGHapticGloveQuickCalibrationImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
         noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
         ;
 
 public:
@@ -118,9 +117,9 @@ public:
      * The move assignment operator.
      */
     FSGHapticGloveQuickCalibrationImpl& operator=(FSGHapticGloveQuickCalibrationImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
         noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
         ;
 
 public:

Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGInterpolationSetImpl.h

@@ -39,8 +39,6 @@
 #include "Runtime/Launch/Resources/Version.h"
 #include "Templates/UniquePtr.h"
 
-#include "SGCoreImpl/SGPlatform.h"
-
 namespace SGCore
 {
     namespace Kinematics
@@ -91,9 +89,9 @@ public:
      * The move constructor.
      */
     FSGInterpolationSetImpl(FSGInterpolationSetImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
         noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
         ;
 
 public:
@@ -112,9 +110,9 @@ public:
      * The move assignment operator.
      */
     FSGInterpolationSetImpl& operator=(FSGInterpolationSetImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
         noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
         ;
 
 public:

Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGNovaGloveHandProfileImpl.h

@@ -39,8 +39,6 @@
 #include "Runtime/Launch/Resources/Version.h"
 #include "Templates/UniquePtr.h"
 
-#include "SGCoreImpl/SGPlatform.h"
-
 class FSGHandInterpolatorImpl;
 
 namespace SGCore
@@ -93,9 +91,9 @@ public:
      * The move constructor.
      */
     FSGNovaGloveHandProfileImpl(FSGNovaGloveHandProfileImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
         noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
         ;
 
 public:
@@ -114,9 +112,9 @@ public:
      * The move assignment operator.
      */
     FSGNovaGloveHandProfileImpl& operator=(FSGNovaGloveHandProfileImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
         noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
         ;
 
 public:

Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGNovaGloveImpl.h

@@ -45,7 +45,6 @@
 #include "Templates/UniquePtr.h"
 
 #include "SGCoreImpl/SGHapticGloveImpl.h"
-#include "SGCoreImpl/SGPlatform.h"
 
 namespace SGCore
 {
@@ -159,9 +158,9 @@ public:
      * The move constructor.
      */
     FSGNovaGloveImpl(FSGNovaGloveImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
         noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
         ;
 
 public:
@@ -180,9 +179,9 @@ public:
      * The move assignment operator.
      */
     FSGNovaGloveImpl& operator=(FSGNovaGloveImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
         noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
         ;
 
 public:

Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGNovaGloveInfoImpl.h

@@ -39,7 +39,6 @@
 #include "Runtime/Launch/Resources/Version.h"
 #include "Templates/UniquePtr.h"
 
-#include "SGCoreImpl/SGPlatform.h"
 #include "SGTypes/SGCoreTypes.h"
 
 namespace SGCore
@@ -94,9 +93,9 @@ public:
      * The move constructor.
      */
     FSGNovaGloveInfoImpl(FSGNovaGloveInfoImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
         noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
         ;
 
 public:
@@ -115,9 +114,9 @@ public:
      * The move assignment operator.
      */
     FSGNovaGloveInfoImpl& operator=(FSGNovaGloveInfoImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
         noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
         ;
 
 public:

Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGNovaGloveSensorDataImpl.h

@@ -40,8 +40,6 @@
 #include "Runtime/Launch/Resources/Version.h"
 #include "Templates/UniquePtr.h"
 
-#include "SGCoreImpl/SGPlatform.h"
-
 namespace SGCore
 {
     namespace Nova
@@ -97,9 +95,9 @@ public:
      * The move constructor.
      */
     FSGNovaGloveSensorDataImpl(FSGNovaGloveSensorDataImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
         noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
         ;
 
 public:
@@ -118,9 +116,9 @@ public:
      * The move assignment operator.
      */
     FSGNovaGloveSensorDataImpl& operator=(FSGNovaGloveSensorDataImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
         noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
         ;
 
 public:

Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGPlatform.h

@@ -1,42 +0,0 @@
-/**
- * @file
- *
- * @author  Mamadou Babaei <mamadou@senseglove.com>
- *
- * @section LICENSE
- *
- * (The MIT License)
- *
- * Copyright (c) 2020 - 2022 SenseGlove
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * @section DESCRIPTION
- *
- *
- */
-
-
-#pragma once
-
-#if ( ( defined( _MSVC_LANG ) && _MSVC_LANG >= 201703L ) || __cplusplus >= 201703L )
-#define SG_CPP17 1
-#else   /* ( ( defined( _MSVC_LANG ) && _MSVC_LANG >= 201703L ) || __cplusplus >= 201703L ) */
-#define SG_CPP17 0
-#endif  /* ( ( defined( _MSVC_LANG ) && _MSVC_LANG >= 201703L ) || __cplusplus >= 201703L ) */

Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGSenseGloveHandProfileImpl.h

@@ -40,7 +40,6 @@
 #include "Runtime/Launch/Resources/Version.h"
 #include "Templates/UniquePtr.h"
 
-#include "SGCoreImpl/SGPlatform.h"
 #include "SGTypes/SGCoreTypes.h"
 
 class FSGHandInterpolatorImpl;
@@ -100,9 +99,9 @@ public:
      * The move constructor.
      */
     FSGSenseGloveHandProfileImpl(FSGSenseGloveHandProfileImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
         noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
         ;
 
 public:
@@ -121,9 +120,9 @@ public:
      * The move assignment operator.
      */
     FSGSenseGloveHandProfileImpl& operator=(FSGSenseGloveHandProfileImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
         noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
         ;
 
 public:

Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGSenseGloveImpl.h

@@ -45,7 +45,6 @@
 #include "Templates/UniquePtr.h"
 
 #include "SGCoreImpl/SGHapticGloveImpl.h"
-#include "SGCoreImpl/SGPlatform.h"
 #include "SGTypes/SGCoreTypes.h"
 
 namespace SGCore
@@ -164,9 +163,9 @@ public:
      * The move constructor.
      */
     FSGSenseGloveImpl(FSGSenseGloveImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
         noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
         ;
 
 public:
@@ -185,9 +184,9 @@ public:
      * The move assignment operator.
      */
     FSGSenseGloveImpl& operator=(FSGSenseGloveImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
         noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
         ;
 
 public:

Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGSenseGloveInfoImpl.h

@@ -40,7 +40,6 @@
 #include "Runtime/Launch/Resources/Version.h"
 #include "Templates/UniquePtr.h"
 
-#include "SGCoreImpl/SGPlatform.h"
 #include "SGTypes/SGCoreTypes.h"
 
 namespace SGCore
@@ -101,9 +100,9 @@ public:
      * The move constructor.
      */
     FSGSenseGloveInfoImpl(FSGSenseGloveInfoImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
         noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
         ;
 
 public:
@@ -122,9 +121,9 @@ public:
      * The move assignment operator.
      */
     FSGSenseGloveInfoImpl& operator=(FSGSenseGloveInfoImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
         noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
         ;
 
 public:

Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGSenseGlovePoseImpl.h

@@ -40,8 +40,6 @@
 #include "Runtime/Launch/Resources/Version.h"
 #include "Templates/UniquePtr.h"
 
-#include "SGCoreImpl/SGPlatform.h"
-
 namespace SGCore
 {
     namespace SG
@@ -98,9 +96,9 @@ public:
      * The move constructor.
      */
     FSGSenseGlovePoseImpl(FSGSenseGlovePoseImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
         noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
         ;
 
 public:
@@ -119,9 +117,9 @@ public:
      * The move assignment operator.
      */
     FSGSenseGlovePoseImpl& operator=(FSGSenseGlovePoseImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
         noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
         ;
 
 public:

Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGSenseGloveSensorDataImpl.h

@@ -39,7 +39,6 @@
 #include "Runtime/Launch/Resources/Version.h"
 #include "Templates/UniquePtr.h"
 
-#include "SGCoreImpl/SGPlatform.h"
 #include "SGTypes/SGCoreTypes.h"
 
 namespace SGCore
@@ -97,9 +96,9 @@ public:
      * The move constructor.
      */
     FSGSenseGloveSensorDataImpl(FSGSenseGloveSensorDataImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
         noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
         ;
 
 public:
@@ -118,9 +117,9 @@ public:
      * The move assignment operator.
      */
     FSGSenseGloveSensorDataImpl& operator=(FSGSenseGloveSensorDataImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
         noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
         ;
 
 public:

Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGSensorRangeImpl.h

@@ -40,8 +40,6 @@
 #include "Runtime/Launch/Resources/Version.h"
 #include "Templates/UniquePtr.h"
 
-#include "SGCoreImpl/SGPlatform.h"
-
 namespace SGCore
 {
     namespace Calibration
@@ -96,9 +94,9 @@ public:
      * The move constructor.
      */
     FSGSensorRangeImpl(FSGSensorRangeImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
         noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
         ;
 
 public:
@@ -117,9 +115,9 @@ public:
      * The move assignment operator.
      */
     FSGSensorRangeImpl& operator=(FSGSensorRangeImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
         noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
         ;
 
 public:

Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGThumperCommandImpl.h

@@ -39,8 +39,6 @@
 #include "Runtime/Launch/Resources/Version.h"
 #include "Templates/UniquePtr.h"
 
-#include "SGCoreImpl/SGPlatform.h"
-
 namespace SGCore
 {
     namespace Haptics
@@ -88,9 +86,9 @@ public:
      * The move constructor
      */
     FSGThumperCommandImpl(FSGThumperCommandImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
         noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
         ;
 
 public:
@@ -109,9 +107,9 @@ public:
      * The move assignment operator.
      */
    FSGThumperCommandImpl& operator=(FSGThumperCommandImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
         noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
         ;
 
 public:

Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGTimedBuzzCommandImpl.h

@@ -42,7 +42,6 @@
 #include "Templates/UniquePtr.h"
 
 #include "SGCoreImpl/SGBuzzCommandImpl.h"
-#include "SGCoreImpl/SGPlatform.h"
 #include "SGTypes/SGCoreTypes.h"
 
 namespace SGCore
@@ -99,9 +98,9 @@ public:
      * The move constructor
      */
     FSGTimedBuzzCommandImpl(FSGTimedBuzzCommandImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
         noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
         ;
 
 public:
@@ -120,9 +119,9 @@ public:
      * The move assignment operator.
      */
     FSGTimedBuzzCommandImpl& operator=(FSGTimedBuzzCommandImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
         noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
         ;
 
 public:

Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGTimedThumpCommandImpl.h

@@ -40,8 +40,6 @@
 #include "Runtime/Launch/Resources/Version.h"
 #include "Templates/UniquePtr.h"
 
-#include "SGCoreImpl/SGPlatform.h"
-
 namespace SGCore
 {
     namespace Haptics
@@ -93,9 +91,9 @@ public:
      * The move constructor
      */
     FSGTimedThumpCommandImpl(FSGTimedThumpCommandImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
         noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
         ;
 
 public:
@@ -114,9 +112,9 @@ public:
      * The move assignment operator.
      */
     FSGTimedThumpCommandImpl& operator=(FSGTimedThumpCommandImpl&& Rhs)
-#if SG_CPP17
+#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
         noexcept
-#endif  /* SG_CPP17 */
+#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
         ;
 
 public:

Source/SenseGloveCoreImpl/SenseGloveCoreImpl.Build.cs

@@ -132,11 +132,6 @@ public class SenseGloveCoreImpl : ModuleRules
                 case WindowsCompiler.VisualStudio2019:
                     LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "msvc142"));
                     break;
-#endif
-#if ! UE_5_0_OR_LATER && UE_4_17_OR_LATER
-                case WindowsCompiler.VisualStudio2017:
-                    LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "msvc141"));
-                    break;
 #endif
                 default:
                     Debug.Assert(false, "Unsupported compiler!");