From 63e2801b6bc6f3e3d04f1556e683cf2376595550 Mon Sep 17 00:00:00 2001 From: Mamadou Babaei Date: Thu, 9 Mar 2023 09:16:27 +0100 Subject: [PATCH] purge the core impl module's dead code for the dropped engine versions: 4.22 to 4.26 and define SG_NOEXCEPT --- .../SGCoreImpl/SGBasicHandModelImpl.cpp | 49 +++----------- .../Private/SGCoreImpl/SGBetaDeviceImpl.cpp | 32 +-------- .../Private/SGCoreImpl/SGBuzzCommandImpl.cpp | 54 +++------------ .../SGCoreImpl/SGCalibrationDataPointImpl.cpp | 39 ++--------- .../Private/SGCoreImpl/SGDeviceImpl.cpp | 33 ++-------- .../Private/SGCoreImpl/SGDeviceModelImpl.cpp | 40 ++--------- .../SGCoreImpl/SGFingerCommandImpl.cpp | 47 ++----------- .../SGCoreImpl/SGForceFeedbackCommandImpl.cpp | 66 +++++-------------- .../SGCoreImpl/SGHandInterpolatorImpl.cpp | 47 ++----------- .../Private/SGCoreImpl/SGHandPoseImpl.cpp | 42 ++---------- .../Private/SGCoreImpl/SGHandProfileImpl.cpp | 40 ++--------- .../SGHapticGloveCalibrationCheckImpl.cpp | 40 ++--------- .../SGHapticGloveCalibrationSequenceImpl.cpp | 47 ++----------- .../SGHapticGloveCommandBufferImpl.cpp | 33 ++-------- .../Private/SGCoreImpl/SGHapticGloveImpl.cpp | 24 +------ .../SGHapticGloveQuickCalibrationImpl.cpp | 33 ++-------- .../SGCoreImpl/SGInterpolationSetImpl.cpp | 47 ++----------- .../SGCoreImpl/SGNovaGloveHandProfileImpl.cpp | 41 ++---------- .../Private/SGCoreImpl/SGNovaGloveImpl.cpp | 32 +-------- .../SGCoreImpl/SGNovaGloveInfoImpl.cpp | 40 ++--------- .../SGCoreImpl/SGNovaGloveSensorDataImpl.cpp | 42 ++---------- .../Private/SGCoreImpl/SGQuatImpl.cpp | 49 +++----------- .../Private/SGCoreImpl/SGQuatImpl.h | 12 +--- .../SGSenseGloveHandProfileImpl.cpp | 39 ++--------- .../Private/SGCoreImpl/SGSenseGloveImpl.cpp | 32 +-------- .../SGCoreImpl/SGSenseGloveInfoImpl.cpp | 40 ++--------- .../SGCoreImpl/SGSenseGlovePoseImpl.cpp | 40 ++--------- .../SGCoreImpl/SGSenseGloveSensorDataImpl.cpp | 42 ++---------- .../Private/SGCoreImpl/SGSensorRangeImpl.cpp | 40 ++--------- .../SGCoreImpl/SGThumperCommandImpl.cpp | 40 ++--------- .../SGCoreImpl/SGTimedBuzzCommandImpl.cpp | 50 +++----------- .../SGCoreImpl/SGTimedThumpCommandImpl.cpp | 47 ++----------- .../Private/SGCoreImpl/SGVect3DImpl.cpp | 47 ++----------- .../Private/SGCoreImpl/SGVect3DImpl.h | 12 +--- .../Public/SGCoreImpl/SGBasicHandModelImpl.h | 12 +--- .../Public/SGCoreImpl/SGBetaDeviceImpl.h | 12 +--- .../Public/SGCoreImpl/SGBuzzCommandImpl.h | 12 +--- .../SGCoreImpl/SGCalibrationDataPointImpl.h | 12 +--- .../Public/SGCoreImpl/SGDeviceImpl.h | 12 +--- .../Public/SGCoreImpl/SGDeviceModelImpl.h | 12 +--- .../Public/SGCoreImpl/SGFingerCommandImpl.h | 12 +--- .../SGCoreImpl/SGForceFeedbackCommandImpl.h | 12 +--- .../SGCoreImpl/SGHandInterpolatorImpl.h | 12 +--- .../Public/SGCoreImpl/SGHandPoseImpl.h | 12 +--- .../Public/SGCoreImpl/SGHandProfileImpl.h | 12 +--- .../SGHapticGloveCalibrationCheckImpl.h | 12 +--- .../SGHapticGloveCalibrationSequenceImpl.h | 12 +--- .../SGHapticGloveCommandBufferImpl.h | 12 +--- .../Public/SGCoreImpl/SGHapticGloveImpl.h | 12 +--- .../SGHapticGloveQuickCalibrationImpl.h | 12 +--- .../SGCoreImpl/SGInterpolationSetImpl.h | 12 +--- .../SGCoreImpl/SGNovaGloveHandProfileImpl.h | 12 +--- .../Public/SGCoreImpl/SGNovaGloveImpl.h | 12 +--- .../Public/SGCoreImpl/SGNovaGloveInfoImpl.h | 12 +--- .../SGCoreImpl/SGNovaGloveSensorDataImpl.h | 12 +--- .../Public/SGCoreImpl/SGPlatform.h | 8 ++- .../SGCoreImpl/SGSenseGloveHandProfileImpl.h | 12 +--- .../Public/SGCoreImpl/SGSenseGloveImpl.h | 12 +--- .../Public/SGCoreImpl/SGSenseGloveInfoImpl.h | 12 +--- .../Public/SGCoreImpl/SGSenseGlovePoseImpl.h | 12 +--- .../SGCoreImpl/SGSenseGloveSensorDataImpl.h | 12 +--- .../Public/SGCoreImpl/SGSensorRangeImpl.h | 12 +--- .../Public/SGCoreImpl/SGThumperCommandImpl.h | 12 +--- .../SGCoreImpl/SGTimedBuzzCommandImpl.h | 12 +--- .../SGCoreImpl/SGTimedThumpCommandImpl.h | 12 +--- 65 files changed, 274 insertions(+), 1452 deletions(-) diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGBasicHandModelImpl.cpp b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGBasicHandModelImpl.cpp index b4d2b237..75cea753 100644 --- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGBasicHandModelImpl.cpp +++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGBasicHandModelImpl.cpp @@ -118,23 +118,13 @@ const TArray& FSGBasicHandModelImpl::GetBaseJointAngles() } FSGBasicHandModelImpl::FSGBasicHandModelImpl() - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { } FSGBasicHandModelImpl::FSGBasicHandModelImpl(const bool bRightHanded, const TArray>& Lengths, const TArray& StartPositions) - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { std::vector> LengthsVector{ FSGArrayUtils::ToMillimeters(Lengths) @@ -150,12 +140,7 @@ FSGBasicHandModelImpl::FSGBasicHandModelImpl(const bool bRightHanded, const TArr FSGBasicHandModelImpl::FSGBasicHandModelImpl(const bool bRightHanded, const TArray>& Lengths, const TArray& StartPositions, const TArray& StartRotations) - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { std::vector> LengthsVector{ FSGArrayUtils::ToMillimeters(Lengths) @@ -175,32 +160,18 @@ FSGBasicHandModelImpl::FSGBasicHandModelImpl(const bool bRightHanded, const TArr } FSGBasicHandModelImpl::FSGBasicHandModelImpl(const FBasicHandModelType& BasicHandModel) - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { Pimpl->BasicHandModel = BasicHandModel; } FSGBasicHandModelImpl::FSGBasicHandModelImpl(const FSGBasicHandModelImpl& Rhs) - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl}, PimplDeleter)) { Pimpl->Owner = this; } -FSGBasicHandModelImpl::FSGBasicHandModelImpl(FSGBasicHandModelImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - = default; +FSGBasicHandModelImpl::FSGBasicHandModelImpl(FSGBasicHandModelImpl&& Rhs) SG_NOEXCEPT = default; FSGBasicHandModelImpl::~FSGBasicHandModelImpl() = default; @@ -211,11 +182,7 @@ FSGBasicHandModelImpl& FSGBasicHandModelImpl::operator=(const FSGBasicHandModelI return *this; } -FSGBasicHandModelImpl& FSGBasicHandModelImpl::operator=(FSGBasicHandModelImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - = default; +FSGBasicHandModelImpl& FSGBasicHandModelImpl::operator=(FSGBasicHandModelImpl&& Rhs) SG_NOEXCEPT = default; const FSGBasicHandModelImpl::FBasicHandModelType& FSGBasicHandModelImpl::ToBasicHandModel() const { @@ -388,4 +355,4 @@ FSGBasicHandModelImpl::FImpl::~FImpl() = default; void FSGBasicHandModelImpl::FImplDeleter::operator()(const FImpl* P) const { delete P; -} +} \ No newline at end of file diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGBetaDeviceImpl.cpp b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGBetaDeviceImpl.cpp index 1edae4dc..a22faeeb 100644 --- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGBetaDeviceImpl.cpp +++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGBetaDeviceImpl.cpp @@ -77,11 +77,7 @@ TSharedRef FSGBetaDeviceImpl::Parse(const FString& String) FSGBetaDeviceImpl::FSGBetaDeviceImpl() : FSGDeviceImpl(), -#if SG_CPP17 Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ { } @@ -93,50 +89,30 @@ FSGBetaDeviceImpl::FSGBetaDeviceImpl(const FString& ConstantsString, const FStri TCHAR_TO_UTF8(*HardwareVersion), FirmwareVersion, SubFirmwareVersion)), -#if SG_CPP17 Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ { } FSGBetaDeviceImpl::FSGBetaDeviceImpl(const FBetaDeviceType BetaDevice) : FSGDeviceImpl(std::make_shared(BetaDevice)), -#if SG_CPP17 Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ { } FSGBetaDeviceImpl::FSGBetaDeviceImpl(const FBetaDevicePtrType BetaDevice) : FSGDeviceImpl(BetaDevice), -#if SG_CPP17 Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ { } FSGBetaDeviceImpl::FSGBetaDeviceImpl(const FSGBetaDeviceImpl& Rhs) : FSGDeviceImpl(Rhs), -#if SG_CPP17 Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl})) -#endif /* SG_CPP17 */ { Pimpl->Owner = this; } -FSGBetaDeviceImpl::FSGBetaDeviceImpl(FSGBetaDeviceImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - = default; +FSGBetaDeviceImpl::FSGBetaDeviceImpl(FSGBetaDeviceImpl&& Rhs) SG_NOEXCEPT = default; FSGBetaDeviceImpl::~FSGBetaDeviceImpl() = default; @@ -148,11 +124,7 @@ FSGBetaDeviceImpl& FSGBetaDeviceImpl::operator=(const FSGBetaDeviceImpl& Rhs) return *this; } -FSGBetaDeviceImpl& FSGBetaDeviceImpl::operator=(FSGBetaDeviceImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - = default; +FSGBetaDeviceImpl& FSGBetaDeviceImpl::operator=(FSGBetaDeviceImpl&& Rhs) SG_NOEXCEPT = default; FSGBetaDeviceImpl::FBetaDeviceType FSGBetaDeviceImpl::ToBetaDevice() const { diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGBuzzCommandImpl.cpp b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGBuzzCommandImpl.cpp index 844c09b4..db2ca937 100644 --- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGBuzzCommandImpl.cpp +++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGBuzzCommandImpl.cpp @@ -75,81 +75,49 @@ const FSGBuzzCommandImpl& FSGBuzzCommandImpl::Off() FSGBuzzCommandImpl::FSGBuzzCommandImpl() : FSGFingerCommandImpl(MakeShared()), -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { } FSGBuzzCommandImpl::FSGBuzzCommandImpl(const TArray& BuzzLevels) : FSGFingerCommandImpl(MakeShared(FSGArrayUtils::ToStdVector(BuzzLevels))), -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { } FSGBuzzCommandImpl::FSGBuzzCommandImpl(const int32 Thumb, const int32 Index, const int32 Middle, const int32 Ring, const int32 Pinky) : FSGFingerCommandImpl(MakeShared(Thumb, Index, Middle, Ring, Pinky)), -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { } FSGBuzzCommandImpl::FSGBuzzCommandImpl(const ESGFinger Finger, const int32 BuzzLevel) : FSGFingerCommandImpl(MakeShared(FSGCoreEnumCast::ToEFinger(Finger), BuzzLevel)), -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { } FSGBuzzCommandImpl::FSGBuzzCommandImpl(const FBuzzCommandType& BuzzCommand) : FSGFingerCommandImpl(MakeShared(BuzzCommand)), -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { } FSGBuzzCommandImpl::FSGBuzzCommandImpl(const TSharedRef BuzzCommand) : FSGFingerCommandImpl(BuzzCommand), -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { } FSGBuzzCommandImpl::FSGBuzzCommandImpl(const FSGBuzzCommandImpl& Rhs) : FSGFingerCommandImpl(Rhs), -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl})) -#endif /* SG_CPP17 */ + Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl}, PimplDeleter)) { Pimpl->Owner = this; } -FSGBuzzCommandImpl::FSGBuzzCommandImpl(FSGBuzzCommandImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - = default; +FSGBuzzCommandImpl::FSGBuzzCommandImpl(FSGBuzzCommandImpl&& Rhs) SG_NOEXCEPT = default; FSGBuzzCommandImpl::~FSGBuzzCommandImpl() = default; @@ -161,11 +129,7 @@ FSGBuzzCommandImpl& FSGBuzzCommandImpl::operator=(const FSGBuzzCommandImpl& Rhs) return *this; } -FSGBuzzCommandImpl& FSGBuzzCommandImpl::operator=(FSGBuzzCommandImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - = default; +FSGBuzzCommandImpl& FSGBuzzCommandImpl::operator=(FSGBuzzCommandImpl&& Rhs) SG_NOEXCEPT = default; const FSGBuzzCommandImpl::FBuzzCommandType& FSGBuzzCommandImpl::ToBuzzCommand() const { diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGCalibrationDataPointImpl.cpp b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGCalibrationDataPointImpl.cpp index c48196a8..8573f254 100644 --- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGCalibrationDataPointImpl.cpp +++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGCalibrationDataPointImpl.cpp @@ -76,23 +76,13 @@ struct FSGCalibrationDataPointImpl::FImpl }; FSGCalibrationDataPointImpl::FSGCalibrationDataPointImpl() - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { } FSGCalibrationDataPointImpl::FSGCalibrationDataPointImpl(const int32 CurrentStage, const TArray& CalibrationValues) - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { std::vector Values( FSGArrayUtils::ToStdVector( @@ -101,32 +91,18 @@ FSGCalibrationDataPointImpl::FSGCalibrationDataPointImpl(const int32 CurrentStag } FSGCalibrationDataPointImpl::FSGCalibrationDataPointImpl(const FCalibrationDataPointType& CalibrationDataPoint) - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { Pimpl->CalibrationDataPoint = CalibrationDataPoint; } FSGCalibrationDataPointImpl::FSGCalibrationDataPointImpl(const FSGCalibrationDataPointImpl& Rhs) - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl}, PimplDeleter)) { Pimpl->Owner = this; } -FSGCalibrationDataPointImpl::FSGCalibrationDataPointImpl(FSGCalibrationDataPointImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - = default; +FSGCalibrationDataPointImpl::FSGCalibrationDataPointImpl(FSGCalibrationDataPointImpl&& Rhs) SG_NOEXCEPT = default; FSGCalibrationDataPointImpl::~FSGCalibrationDataPointImpl() = default; @@ -137,10 +113,7 @@ FSGCalibrationDataPointImpl& FSGCalibrationDataPointImpl::operator=(const FSGCal return *this; } -FSGCalibrationDataPointImpl& FSGCalibrationDataPointImpl::operator=(FSGCalibrationDataPointImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ +FSGCalibrationDataPointImpl& FSGCalibrationDataPointImpl::operator=(FSGCalibrationDataPointImpl&& Rhs) SG_NOEXCEPT = default; const FSGCalibrationDataPointImpl::FCalibrationDataPointType& diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGDeviceImpl.cpp b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGDeviceImpl.cpp index 3c2a422f..afdfd47f 100644 --- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGDeviceImpl.cpp +++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGDeviceImpl.cpp @@ -89,43 +89,24 @@ FString FSGDeviceImpl::ToString(ESGDeviceType DeviceType) } FSGDeviceImpl::FSGDeviceImpl() - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { } FSGDeviceImpl::FSGDeviceImpl(const FSGDevicePtrType SGDevice) - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { ensureAlwaysMsgf(SGDevice.get(), TEXT("Invalid SGDevice!")); Pimpl->SGDevice = SGDevice; } FSGDeviceImpl::FSGDeviceImpl(const FSGDeviceImpl& Rhs) - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl}, PimplDeleter)) { Pimpl->Owner = this; } -FSGDeviceImpl::FSGDeviceImpl(FSGDeviceImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - = default; +FSGDeviceImpl::FSGDeviceImpl(FSGDeviceImpl&& Rhs) SG_NOEXCEPT = default; FSGDeviceImpl::~FSGDeviceImpl() = default; @@ -136,11 +117,7 @@ FSGDeviceImpl& FSGDeviceImpl::operator=(const FSGDeviceImpl& Rhs) return *this; } -FSGDeviceImpl& FSGDeviceImpl::operator=(FSGDeviceImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - = default; +FSGDeviceImpl& FSGDeviceImpl::operator=(FSGDeviceImpl&& Rhs) SG_NOEXCEPT = default; FSGDeviceImpl::FSGDevicePtrType FSGDeviceImpl::ToSGDevicePtr() const { diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGDeviceModelImpl.cpp b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGDeviceModelImpl.cpp index 633ce75c..18a7f6f2 100644 --- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGDeviceModelImpl.cpp +++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGDeviceModelImpl.cpp @@ -96,23 +96,13 @@ void FSGDeviceModelImpl::ParseFirmware(const FString& RawFirmware, int32& OutMai } FSGDeviceModelImpl::FSGDeviceModelImpl() - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { } FSGDeviceModelImpl::FSGDeviceModelImpl( const FString& Id, const FString& HardwareVersion, const int32 FirmwareVersion, const int32 SubFirmwareVersion) - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { std::string IdString(TCHAR_TO_UTF8(*Id)); std::string HardwareVersionString(TCHAR_TO_UTF8(*HardwareVersion)); @@ -121,32 +111,18 @@ FSGDeviceModelImpl::FSGDeviceModelImpl( } FSGDeviceModelImpl::FSGDeviceModelImpl(const FDeviceModelType& DeviceModel) - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { Pimpl->DeviceModel = DeviceModel; } FSGDeviceModelImpl::FSGDeviceModelImpl(const FSGDeviceModelImpl& Rhs) - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl}, PimplDeleter)) { Pimpl->Owner = this; } -FSGDeviceModelImpl::FSGDeviceModelImpl(FSGDeviceModelImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - = default; +FSGDeviceModelImpl::FSGDeviceModelImpl(FSGDeviceModelImpl&& Rhs) SG_NOEXCEPT = default; FSGDeviceModelImpl::~FSGDeviceModelImpl() = default; @@ -157,11 +133,7 @@ FSGDeviceModelImpl& FSGDeviceModelImpl::operator=(const FSGDeviceModelImpl& Rhs) return *this; } -FSGDeviceModelImpl& FSGDeviceModelImpl::operator=(FSGDeviceModelImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - = default; +FSGDeviceModelImpl& FSGDeviceModelImpl::operator=(FSGDeviceModelImpl&& Rhs) SG_NOEXCEPT = default; const FSGDeviceModelImpl::FDeviceModelType& FSGDeviceModelImpl::ToDeviceModel() const { diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGFingerCommandImpl.cpp b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGFingerCommandImpl.cpp index 8e07c0ba..11129ade 100644 --- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGFingerCommandImpl.cpp +++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGFingerCommandImpl.cpp @@ -83,22 +83,12 @@ struct FSGFingerCommandImpl::FImpl }; FSGFingerCommandImpl::FSGFingerCommandImpl() - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { } FSGFingerCommandImpl::FSGFingerCommandImpl(const TArray& Levels) - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { std::vector LevelsVector{ FSGArrayUtils::ToStdVector(Levels) @@ -107,44 +97,25 @@ FSGFingerCommandImpl::FSGFingerCommandImpl(const TArray& Levels) } FSGFingerCommandImpl::FSGFingerCommandImpl(const FFingerCommandType& FingerCommand) - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { Pimpl->FingerCommand = MakeShared(FingerCommand); } FSGFingerCommandImpl::FSGFingerCommandImpl(const TSharedRef FingerCommand) - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { Pimpl->FingerCommand = FImpl::MakeNewFingerCommand(FingerCommand); } FSGFingerCommandImpl::FSGFingerCommandImpl(const FSGFingerCommandImpl& Rhs) - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl}, PimplDeleter)) { Pimpl->Owner = this; Pimpl->FingerCommand = FImpl::MakeNewFingerCommand(Rhs.Pimpl->FingerCommand); } -FSGFingerCommandImpl::FSGFingerCommandImpl(FSGFingerCommandImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - = default; +FSGFingerCommandImpl::FSGFingerCommandImpl(FSGFingerCommandImpl&& Rhs) SG_NOEXCEPT = default; FSGFingerCommandImpl::~FSGFingerCommandImpl() = default; @@ -155,11 +126,7 @@ FSGFingerCommandImpl& FSGFingerCommandImpl::operator=(const FSGFingerCommandImpl return *this; } -FSGFingerCommandImpl& FSGFingerCommandImpl::operator=(FSGFingerCommandImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - = default; +FSGFingerCommandImpl& FSGFingerCommandImpl::operator=(FSGFingerCommandImpl&& Rhs) SG_NOEXCEPT = default; const FSGFingerCommandImpl::FFingerCommandType& FSGFingerCommandImpl::ToFingerCommand() const { diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGForceFeedbackCommandImpl.cpp b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGForceFeedbackCommandImpl.cpp index eececcaf..ded54250 100644 --- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGForceFeedbackCommandImpl.cpp +++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGForceFeedbackCommandImpl.cpp @@ -75,82 +75,51 @@ const FSGForceFeedbackCommandImpl& FSGForceFeedbackCommandImpl::Off() FSGForceFeedbackCommandImpl::FSGForceFeedbackCommandImpl() : FSGFingerCommandImpl(MakeShared()), -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { } FSGForceFeedbackCommandImpl::FSGForceFeedbackCommandImpl(const TArray& ForceFeedbackLevels) : FSGFingerCommandImpl(MakeShared( - FSGArrayUtils::ToStdVector(ForceFeedbackLevels))), -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + FSGArrayUtils::ToStdVector(ForceFeedbackLevels))), + Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { } FSGForceFeedbackCommandImpl::FSGForceFeedbackCommandImpl(const int32 Thumb, const int32 Index, const int32 Middle, const int32 Ring, const int32 Pinky) : FSGFingerCommandImpl(MakeShared(Thumb, Index, Middle, Ring, Pinky)), -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { } FSGForceFeedbackCommandImpl::FSGForceFeedbackCommandImpl(const ESGFinger Finger, const int32 BuzzLevel) : FSGFingerCommandImpl(MakeShared(FSGCoreEnumCast::ToEFinger(Finger), BuzzLevel)), -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { } FSGForceFeedbackCommandImpl::FSGForceFeedbackCommandImpl(const FForceFeedbackCommandType& ForceFeedbackCommand) : FSGFingerCommandImpl(MakeShared(ForceFeedbackCommand)), -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { } -FSGForceFeedbackCommandImpl::FSGForceFeedbackCommandImpl(const TSharedRef ForceFeedbackCommand) +FSGForceFeedbackCommandImpl::FSGForceFeedbackCommandImpl( + const TSharedRef ForceFeedbackCommand) : FSGFingerCommandImpl(ForceFeedbackCommand), -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { } FSGForceFeedbackCommandImpl::FSGForceFeedbackCommandImpl(const FSGForceFeedbackCommandImpl& Rhs) : FSGFingerCommandImpl(Rhs), -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl})) -#endif /* SG_CPP17 */ + Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl}, PimplDeleter)) { Pimpl->Owner = this; } -FSGForceFeedbackCommandImpl::FSGForceFeedbackCommandImpl(FSGForceFeedbackCommandImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - = default; +FSGForceFeedbackCommandImpl::FSGForceFeedbackCommandImpl(FSGForceFeedbackCommandImpl&& Rhs) SG_NOEXCEPT = default; FSGForceFeedbackCommandImpl::~FSGForceFeedbackCommandImpl() = default; @@ -162,18 +131,17 @@ FSGForceFeedbackCommandImpl& FSGForceFeedbackCommandImpl::operator=(const FSGFor return *this; } -FSGForceFeedbackCommandImpl& FSGForceFeedbackCommandImpl::operator=(FSGForceFeedbackCommandImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ +FSGForceFeedbackCommandImpl& FSGForceFeedbackCommandImpl::operator=(FSGForceFeedbackCommandImpl&& Rhs) SG_NOEXCEPT = default; -const FSGForceFeedbackCommandImpl::FForceFeedbackCommandType& FSGForceFeedbackCommandImpl::ToForceFeedbackCommand() const +const FSGForceFeedbackCommandImpl::FForceFeedbackCommandType& +FSGForceFeedbackCommandImpl::ToForceFeedbackCommand() const { return *StaticCastSharedRef(ToFingerCommandRef()); } -TSharedRef FSGForceFeedbackCommandImpl::ToForceFeedbackCommandRef() const +TSharedRef +FSGForceFeedbackCommandImpl::ToForceFeedbackCommandRef() const { return StaticCastSharedRef(ToFingerCommandRef()); } @@ -198,4 +166,4 @@ FSGForceFeedbackCommandImpl::FImpl::~FImpl() = default; void FSGForceFeedbackCommandImpl::FImplDeleter::operator()(const FSGForceFeedbackCommandImpl::FImpl* P) const { delete P; -} +} \ No newline at end of file diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHandInterpolatorImpl.cpp b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHandInterpolatorImpl.cpp index 90df3bed..9afe44df 100644 --- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHandInterpolatorImpl.cpp +++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHandInterpolatorImpl.cpp @@ -132,22 +132,12 @@ TArray> FSGHandInterpolatorImpl::InterpolateHandAngles(const FSG } FSGHandInterpolatorImpl::FSGHandInterpolatorImpl() - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { } FSGHandInterpolatorImpl::FSGHandInterpolatorImpl(const TArray>& JointInterpolations) - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { std::vector> JointInterpolationsVector{ FSGArrayUtils::ToStdVector>& JointInterpolations, const FQuat& CmcStartRotation) - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { std::vector> JointInterpolationsVector{ FSGArrayUtils::ToStdVector(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { Pimpl->HandInterpolator = HandInterpolator; } FSGHandInterpolatorImpl::FSGHandInterpolatorImpl(const FSGHandInterpolatorImpl& Rhs) - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl}, PimplDeleter)) { Pimpl->Owner = this; } -FSGHandInterpolatorImpl::FSGHandInterpolatorImpl(FSGHandInterpolatorImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ -= default; +FSGHandInterpolatorImpl::FSGHandInterpolatorImpl(FSGHandInterpolatorImpl&& Rhs) SG_NOEXCEPT = default; FSGHandInterpolatorImpl::~FSGHandInterpolatorImpl() = default; @@ -210,11 +181,7 @@ FSGHandInterpolatorImpl& FSGHandInterpolatorImpl::operator=(const FSGHandInterpo return *this; } -FSGHandInterpolatorImpl& FSGHandInterpolatorImpl::operator=(FSGHandInterpolatorImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ -= default; +FSGHandInterpolatorImpl& FSGHandInterpolatorImpl::operator=(FSGHandInterpolatorImpl&& Rhs) SG_NOEXCEPT = default; const FSGHandInterpolatorImpl::FHandInterpolatorType& FSGHandInterpolatorImpl::ToHandInterpolator( ) const diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHandPoseImpl.cpp b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHandPoseImpl.cpp index 5f75a9f1..304fedc9 100644 --- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHandPoseImpl.cpp +++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHandPoseImpl.cpp @@ -145,23 +145,13 @@ FSGHandPoseImpl FSGHandPoseImpl::Fist(const bool bRightHanded) } FSGHandPoseImpl::FSGHandPoseImpl() - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { } FSGHandPoseImpl::FSGHandPoseImpl(const bool bRightHanded, const TArray>& JointPositions, const TArray>& JointRotations, const TArray>& HandAngles) - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { std::vector> JointPositionsVector{ FSGArrayUtils::ToMillimeters(JointPositions) @@ -180,32 +170,18 @@ FSGHandPoseImpl::FSGHandPoseImpl(const bool bRightHanded, const TArray(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { Pimpl->HandPose = SenseGloveHandPose; } FSGHandPoseImpl::FSGHandPoseImpl(const FSGHandPoseImpl& Rhs) - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl}, PimplDeleter)) { Pimpl->Owner = this; } -FSGHandPoseImpl::FSGHandPoseImpl(FSGHandPoseImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - = default; +FSGHandPoseImpl::FSGHandPoseImpl(FSGHandPoseImpl&& Rhs) SG_NOEXCEPT = default; FSGHandPoseImpl::~FSGHandPoseImpl() = default; @@ -216,11 +192,7 @@ FSGHandPoseImpl& FSGHandPoseImpl::operator=(const FSGHandPoseImpl& Rhs) return *this; } -FSGHandPoseImpl& FSGHandPoseImpl::operator=(FSGHandPoseImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ -= default; +FSGHandPoseImpl& FSGHandPoseImpl::operator=(FSGHandPoseImpl&& Rhs) SG_NOEXCEPT = default; const FSGHandPoseImpl::FHandPoseType& FSGHandPoseImpl::ToHandPose() const { @@ -298,4 +270,4 @@ FSGHandPoseImpl::FImpl::~FImpl() = default; void FSGHandPoseImpl::FImplDeleter::operator()(const FImpl* P) const { delete P; -} +} \ No newline at end of file diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHandProfileImpl.cpp b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHandProfileImpl.cpp index 3e51dc5c..fbbe9e46 100644 --- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHandProfileImpl.cpp +++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHandProfileImpl.cpp @@ -141,56 +141,32 @@ void FSGHandProfileImpl::ResetCalibration(const bool bOnDisk) } FSGHandProfileImpl::FSGHandProfileImpl() - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { } FSGHandProfileImpl::FSGHandProfileImpl(const bool bRightHanded, const FSGSenseGloveHandProfileImpl& SenseGloveHandProfile, const FSGNovaGloveHandProfileImpl& NovaGloveHandProfile) - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { Pimpl->HandProfile = FHandProfileType( bRightHanded, SenseGloveHandProfile.ToSenseGloveHandProfile(), NovaGloveHandProfile.ToNovaGloveHandProfile()); } FSGHandProfileImpl::FSGHandProfileImpl(const FHandProfileType& SenseGloveHandProfile) - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { Pimpl->HandProfile = SenseGloveHandProfile; } FSGHandProfileImpl::FSGHandProfileImpl(const FSGHandProfileImpl& Rhs) - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl}, PimplDeleter)) { Pimpl->Owner = this; } -FSGHandProfileImpl::FSGHandProfileImpl(FSGHandProfileImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - = default; +FSGHandProfileImpl::FSGHandProfileImpl(FSGHandProfileImpl&& Rhs) SG_NOEXCEPT = default; FSGHandProfileImpl::~FSGHandProfileImpl() = default; @@ -201,11 +177,7 @@ FSGHandProfileImpl& FSGHandProfileImpl::operator=(const FSGHandProfileImpl& Rhs) return *this; } -FSGHandProfileImpl& FSGHandProfileImpl::operator=(FSGHandProfileImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ -= default; +FSGHandProfileImpl& FSGHandProfileImpl::operator=(FSGHandProfileImpl&& Rhs) SG_NOEXCEPT = default; const FSGHandProfileImpl::FHandProfileType& FSGHandProfileImpl::ToHandProfile( ) const diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHapticGloveCalibrationCheckImpl.cpp b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHapticGloveCalibrationCheckImpl.cpp index 133d1369..dbed7483 100644 --- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHapticGloveCalibrationCheckImpl.cpp +++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHapticGloveCalibrationCheckImpl.cpp @@ -157,56 +157,32 @@ bool FSGHapticGloveCalibrationCheckImpl::MatchesLast(const TArray& Curr } FSGHapticGloveCalibrationCheckImpl::FSGHapticGloveCalibrationCheckImpl() - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { } FSGHapticGloveCalibrationCheckImpl::FSGHapticGloveCalibrationCheckImpl(const FSGSensorRangeImpl& LastCalibrationRange) - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { Pimpl->HapticGloveCalibrationCheck = FHapticGloveCalibrationCheckType(LastCalibrationRange.ToSensorRange()); } FSGHapticGloveCalibrationCheckImpl::FSGHapticGloveCalibrationCheckImpl( const FHapticGloveCalibrationCheckType& HapticGloveCalibrationCheck) - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { Pimpl->HapticGloveCalibrationCheck = HapticGloveCalibrationCheck; } FSGHapticGloveCalibrationCheckImpl::FSGHapticGloveCalibrationCheckImpl( const FSGHapticGloveCalibrationCheckImpl& Rhs) - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl}, PimplDeleter)) { Pimpl->Owner = this; } FSGHapticGloveCalibrationCheckImpl::FSGHapticGloveCalibrationCheckImpl( - FSGHapticGloveCalibrationCheckImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - = default; + FSGHapticGloveCalibrationCheckImpl&& Rhs) SG_NOEXCEPT = default; FSGHapticGloveCalibrationCheckImpl::~FSGHapticGloveCalibrationCheckImpl() = default; @@ -219,11 +195,7 @@ FSGHapticGloveCalibrationCheckImpl& FSGHapticGloveCalibrationCheckImpl::operator } FSGHapticGloveCalibrationCheckImpl& FSGHapticGloveCalibrationCheckImpl::operator=( - FSGHapticGloveCalibrationCheckImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - = default; + FSGHapticGloveCalibrationCheckImpl&& Rhs) SG_NOEXCEPT = default; const FSGHapticGloveCalibrationCheckImpl::FHapticGloveCalibrationCheckType& FSGHapticGloveCalibrationCheckImpl::ToHapticGloveCalibrationCheck() const diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHapticGloveCalibrationSequenceImpl.cpp b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHapticGloveCalibrationSequenceImpl.cpp index 20fdf2e1..f04b5543 100644 --- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHapticGloveCalibrationSequenceImpl.cpp +++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHapticGloveCalibrationSequenceImpl.cpp @@ -113,23 +113,13 @@ bool FSGHapticGloveCalibrationSequenceImpl::CompileProfile(const FSGSensorRangeI } FSGHapticGloveCalibrationSequenceImpl::FSGHapticGloveCalibrationSequenceImpl() - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { } FSGHapticGloveCalibrationSequenceImpl::FSGHapticGloveCalibrationSequenceImpl( const TSharedRef LinkedGlove) - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { Pimpl->HapticGloveCalibrationSequence = MakeShared( LinkedGlove->ToHapticGlovePtrChecked()); @@ -137,12 +127,7 @@ FSGHapticGloveCalibrationSequenceImpl::FSGHapticGloveCalibrationSequenceImpl( FSGHapticGloveCalibrationSequenceImpl::FSGHapticGloveCalibrationSequenceImpl( const FHapticGloveCalibrationSequenceType& HapticGloveCalibrationSequence) - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { Pimpl->HapticGloveCalibrationSequence = MakeShared( HapticGloveCalibrationSequence); @@ -150,12 +135,7 @@ FSGHapticGloveCalibrationSequenceImpl::FSGHapticGloveCalibrationSequenceImpl( FSGHapticGloveCalibrationSequenceImpl::FSGHapticGloveCalibrationSequenceImpl( TSharedRef HapticGloveCalibrationSequence) - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { Pimpl->HapticGloveCalibrationSequence = Pimpl->MakeNewHapticGloveCalibrationSequence(HapticGloveCalibrationSequence); @@ -163,22 +143,13 @@ FSGHapticGloveCalibrationSequenceImpl::FSGHapticGloveCalibrationSequenceImpl( FSGHapticGloveCalibrationSequenceImpl::FSGHapticGloveCalibrationSequenceImpl( const FSGHapticGloveCalibrationSequenceImpl& Rhs) - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl}, PimplDeleter)) { Pimpl->Owner = this; } FSGHapticGloveCalibrationSequenceImpl::FSGHapticGloveCalibrationSequenceImpl( - FSGHapticGloveCalibrationSequenceImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - = default; + FSGHapticGloveCalibrationSequenceImpl&& Rhs) SG_NOEXCEPT = default; FSGHapticGloveCalibrationSequenceImpl::~FSGHapticGloveCalibrationSequenceImpl() = default; @@ -191,11 +162,7 @@ FSGHapticGloveCalibrationSequenceImpl& FSGHapticGloveCalibrationSequenceImpl::op } FSGHapticGloveCalibrationSequenceImpl& FSGHapticGloveCalibrationSequenceImpl::operator=( - FSGHapticGloveCalibrationSequenceImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - = default; + FSGHapticGloveCalibrationSequenceImpl&& Rhs) SG_NOEXCEPT = default; const FSGHapticGloveCalibrationSequenceImpl::FHapticGloveCalibrationSequenceType& FSGHapticGloveCalibrationSequenceImpl::ToHapticGloveCalibrationSequence() const diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHapticGloveCommandBufferImpl.cpp b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHapticGloveCommandBufferImpl.cpp index 23253def..26fd0900 100644 --- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHapticGloveCommandBufferImpl.cpp +++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHapticGloveCommandBufferImpl.cpp @@ -97,45 +97,26 @@ int32 FSGHapticGloveCommandBufferImpl::GetMaxThumpCommands() } FSGHapticGloveCommandBufferImpl::FSGHapticGloveCommandBufferImpl() - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { } FSGHapticGloveCommandBufferImpl::FSGHapticGloveCommandBufferImpl( const FHapticGloveCommandBufferType& HapticGloveCommandBuffer) - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { Pimpl->HapticGloveCommandBuffer = HapticGloveCommandBuffer; } FSGHapticGloveCommandBufferImpl::FSGHapticGloveCommandBufferImpl( const FSGHapticGloveCommandBufferImpl& Rhs) - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl}, PimplDeleter)) { Pimpl->Owner = this; } FSGHapticGloveCommandBufferImpl::FSGHapticGloveCommandBufferImpl( - FSGHapticGloveCommandBufferImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - = default; + FSGHapticGloveCommandBufferImpl&& Rhs) SG_NOEXCEPT = default; FSGHapticGloveCommandBufferImpl::~FSGHapticGloveCommandBufferImpl() = default; @@ -148,11 +129,7 @@ FSGHapticGloveCommandBufferImpl& FSGHapticGloveCommandBufferImpl::operator=( } FSGHapticGloveCommandBufferImpl& FSGHapticGloveCommandBufferImpl::operator=( - FSGHapticGloveCommandBufferImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - = default; + FSGHapticGloveCommandBufferImpl&& Rhs) SG_NOEXCEPT = default; const FSGHapticGloveCommandBufferImpl::FHapticGloveCommandBufferType& FSGHapticGloveCommandBufferImpl::ToHapticGloveCommandBuffer() const diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHapticGloveImpl.cpp b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHapticGloveImpl.cpp index 58f32a08..eea9c10b 100644 --- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHapticGloveImpl.cpp +++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHapticGloveImpl.cpp @@ -126,40 +126,24 @@ bool FSGHapticGloveImpl::GetGlove(const bool bRightHanded, TSharedPtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ { } FSGHapticGloveImpl::FSGHapticGloveImpl(const FHapticGlovePtrType HapticGlove) : FSGDeviceImpl(std::dynamic_pointer_cast(HapticGlove)), -#if SG_CPP17 Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ { } FSGHapticGloveImpl::FSGHapticGloveImpl(const FSGHapticGloveImpl& Rhs) : FSGDeviceImpl(Rhs), -#if SG_CPP17 Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl})) -#endif /* SG_CPP17 */ { Pimpl->Owner = this; } -FSGHapticGloveImpl::FSGHapticGloveImpl(FSGHapticGloveImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - = default; +FSGHapticGloveImpl::FSGHapticGloveImpl(FSGHapticGloveImpl&& Rhs) SG_NOEXCEPT = default; FSGHapticGloveImpl::~FSGHapticGloveImpl() = default; @@ -171,11 +155,7 @@ FSGHapticGloveImpl& FSGHapticGloveImpl::operator=(const FSGHapticGloveImpl& Rhs) return *this; } -FSGHapticGloveImpl& FSGHapticGloveImpl::operator=(FSGHapticGloveImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - = default; +FSGHapticGloveImpl& FSGHapticGloveImpl::operator=(FSGHapticGloveImpl&& Rhs) SG_NOEXCEPT = default; FSGHapticGloveImpl::FHapticGlovePtrType FSGHapticGloveImpl::ToHapticGlovePtr() const { diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHapticGloveQuickCalibrationImpl.cpp b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHapticGloveQuickCalibrationImpl.cpp index 50c5340f..afbcbb0d 100644 --- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHapticGloveQuickCalibrationImpl.cpp +++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGHapticGloveQuickCalibrationImpl.cpp @@ -88,11 +88,7 @@ float FSGHapticGloveQuickCalibrationImpl::GetDefaultAutoEndTimeout() FSGHapticGloveQuickCalibrationImpl::FSGHapticGloveQuickCalibrationImpl() : FSGHapticGloveCalibrationSequenceImpl(), -#if SG_CPP17 Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ { } @@ -100,42 +96,25 @@ FSGHapticGloveQuickCalibrationImpl::FSGHapticGloveQuickCalibrationImpl( const TSharedRef GloveToCalibrate, const float AutoEndTimeout) : FSGHapticGloveCalibrationSequenceImpl( MakeShared(GloveToCalibrate->ToHapticGlovePtr(), AutoEndTimeout)), -#if SG_CPP17 Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ { } FSGHapticGloveQuickCalibrationImpl::FSGHapticGloveQuickCalibrationImpl( const FHapticGloveQuickCalibrationType& HapticGloveQuickCalibration) : FSGHapticGloveCalibrationSequenceImpl(MakeShared(HapticGloveQuickCalibration)), -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { } FSGHapticGloveQuickCalibrationImpl::FSGHapticGloveQuickCalibrationImpl(const FSGHapticGloveQuickCalibrationImpl& Rhs) - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl}, PimplDeleter)) { Pimpl->Owner = this; } FSGHapticGloveQuickCalibrationImpl::FSGHapticGloveQuickCalibrationImpl( - FSGHapticGloveQuickCalibrationImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - = default; + FSGHapticGloveQuickCalibrationImpl&& Rhs) SG_NOEXCEPT = default; FSGHapticGloveQuickCalibrationImpl::~FSGHapticGloveQuickCalibrationImpl() = default; @@ -148,11 +127,7 @@ FSGHapticGloveQuickCalibrationImpl& FSGHapticGloveQuickCalibrationImpl::operator } FSGHapticGloveQuickCalibrationImpl& FSGHapticGloveQuickCalibrationImpl::operator=( - FSGHapticGloveQuickCalibrationImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - = default; + FSGHapticGloveQuickCalibrationImpl&& Rhs) SG_NOEXCEPT = default; const FSGHapticGloveQuickCalibrationImpl::FHapticGloveQuickCalibrationType& FSGHapticGloveQuickCalibrationImpl::ToHapticGloveQuickCalibration() const diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGInterpolationSetImpl.cpp b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGInterpolationSetImpl.cpp index 1021ee3b..25f01360 100644 --- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGInterpolationSetImpl.cpp +++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGInterpolationSetImpl.cpp @@ -81,65 +81,36 @@ FSGInterpolationSetImpl FSGInterpolationSetImpl::Deserialize(const FString& Seri } FSGInterpolationSetImpl::FSGInterpolationSetImpl() - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { } FSGInterpolationSetImpl::FSGInterpolationSetImpl(const float From1, const float From2, const float To1, const float To2) - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { Pimpl->InterpolationSet = FInterpolationSetType(From1, From2, To1, To2); } FSGInterpolationSetImpl::FSGInterpolationSetImpl(const float From1, const float From2, const float To1, const float To2, const float Min, const float Max) - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { Pimpl->InterpolationSet = FInterpolationSetType(From1, From2, To1, To2, Min, Max); } FSGInterpolationSetImpl::FSGInterpolationSetImpl(const FInterpolationSetType& InterpolationSet) - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { Pimpl->InterpolationSet = InterpolationSet; } FSGInterpolationSetImpl::FSGInterpolationSetImpl(const FSGInterpolationSetImpl& Rhs) - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl}, PimplDeleter)) { Pimpl->Owner = this; } -FSGInterpolationSetImpl::FSGInterpolationSetImpl(FSGInterpolationSetImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - = default; +FSGInterpolationSetImpl::FSGInterpolationSetImpl(FSGInterpolationSetImpl&& Rhs) SG_NOEXCEPT = default; FSGInterpolationSetImpl::~FSGInterpolationSetImpl() = default; @@ -150,11 +121,7 @@ FSGInterpolationSetImpl& FSGInterpolationSetImpl::operator=(const FSGInterpolati return *this; } -FSGInterpolationSetImpl& FSGInterpolationSetImpl::operator=(FSGInterpolationSetImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - = default; +FSGInterpolationSetImpl& FSGInterpolationSetImpl::operator=(FSGInterpolationSetImpl&& Rhs) SG_NOEXCEPT = default; const FSGInterpolationSetImpl::FInterpolationSetType& FSGInterpolationSetImpl::ToInterpolationSet() const { diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGNovaGloveHandProfileImpl.cpp b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGNovaGloveHandProfileImpl.cpp index b590fa40..39d07aba 100644 --- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGNovaGloveHandProfileImpl.cpp +++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGNovaGloveHandProfileImpl.cpp @@ -89,53 +89,29 @@ FSGNovaGloveHandProfileImpl FSGNovaGloveHandProfileImpl::Deserialize(const FStri } FSGNovaGloveHandProfileImpl::FSGNovaGloveHandProfileImpl() - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { } FSGNovaGloveHandProfileImpl::FSGNovaGloveHandProfileImpl(bool bRightHanded, const FSGHandInterpolatorImpl& Interpolator) - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { Pimpl->NovaGloveHandProfile = FNovaGloveHandProfileType(bRightHanded, Interpolator.ToHandInterpolator()); } FSGNovaGloveHandProfileImpl::FSGNovaGloveHandProfileImpl(const FNovaGloveHandProfileType& NovaGloveHandProfile) - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { Pimpl->NovaGloveHandProfile = NovaGloveHandProfile; } FSGNovaGloveHandProfileImpl::FSGNovaGloveHandProfileImpl(const FSGNovaGloveHandProfileImpl& Rhs) - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl}, PimplDeleter)) { Pimpl->Owner = this; } -FSGNovaGloveHandProfileImpl::FSGNovaGloveHandProfileImpl(FSGNovaGloveHandProfileImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - = default; +FSGNovaGloveHandProfileImpl::FSGNovaGloveHandProfileImpl(FSGNovaGloveHandProfileImpl&& Rhs) SG_NOEXCEPT = default; FSGNovaGloveHandProfileImpl::~FSGNovaGloveHandProfileImpl() = default; @@ -146,10 +122,7 @@ FSGNovaGloveHandProfileImpl& FSGNovaGloveHandProfileImpl::operator=(const FSGNov return *this; } -FSGNovaGloveHandProfileImpl& FSGNovaGloveHandProfileImpl::operator=(FSGNovaGloveHandProfileImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ +FSGNovaGloveHandProfileImpl& FSGNovaGloveHandProfileImpl::operator=(FSGNovaGloveHandProfileImpl&& Rhs) SG_NOEXCEPT = default; const FSGNovaGloveHandProfileImpl::FNovaGloveHandProfileType& FSGNovaGloveHandProfileImpl::ToNovaGloveHandProfile( @@ -196,4 +169,4 @@ FSGNovaGloveHandProfileImpl::FImpl::~FImpl() = default; void FSGNovaGloveHandProfileImpl::FImplDeleter::operator()(const FImpl* P) const { delete P; -} +} \ No newline at end of file diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGNovaGloveImpl.cpp b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGNovaGloveImpl.cpp index fb339ae0..e715a7e0 100644 --- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGNovaGloveImpl.cpp +++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGNovaGloveImpl.cpp @@ -238,60 +238,36 @@ FString FSGNovaGloveImpl::ToBytes(const FSGBuzzCommandImpl& BuzzCommand) FSGNovaGloveImpl::FSGNovaGloveImpl() : FSGHapticGloveImpl(), -#if SG_CPP17 Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ { } FSGNovaGloveImpl::FSGNovaGloveImpl(const FSGNovaGloveInfoImpl& DeviceInfo) : FSGHapticGloveImpl(FSGNovaGloveImpl(std::make_shared((DeviceInfo.ToNovaGloveInfo())))), -#if SG_CPP17 Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ { } FSGNovaGloveImpl::FSGNovaGloveImpl(const FNovaGloveType NovaGlove) : FSGHapticGloveImpl(std::make_shared(NovaGlove)), -#if SG_CPP17 Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ { } FSGNovaGloveImpl::FSGNovaGloveImpl(const FNovaGlovePtrType NovaGlove) : FSGHapticGloveImpl(NovaGlove), -#if SG_CPP17 Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ { } FSGNovaGloveImpl::FSGNovaGloveImpl(const FSGNovaGloveImpl& Rhs) : FSGHapticGloveImpl(Rhs), -#if SG_CPP17 Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl})) -#endif /* SG_CPP17 */ { Pimpl->Owner = this; } -FSGNovaGloveImpl::FSGNovaGloveImpl(FSGNovaGloveImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - = default; +FSGNovaGloveImpl::FSGNovaGloveImpl(FSGNovaGloveImpl&& Rhs) SG_NOEXCEPT = default; FSGNovaGloveImpl::~FSGNovaGloveImpl() = default; @@ -303,11 +279,7 @@ FSGNovaGloveImpl& FSGNovaGloveImpl::operator=(const FSGNovaGloveImpl& Rhs) return *this; } -FSGNovaGloveImpl& FSGNovaGloveImpl::operator=(FSGNovaGloveImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - = default; +FSGNovaGloveImpl& FSGNovaGloveImpl::operator=(FSGNovaGloveImpl&& Rhs) SG_NOEXCEPT = default; const FSGNovaGloveImpl::FNovaGloveType& FSGNovaGloveImpl::ToNovaGlove() const { diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGNovaGloveInfoImpl.cpp b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGNovaGloveInfoImpl.cpp index b93a7dfd..618e8130 100644 --- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGNovaGloveInfoImpl.cpp +++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGNovaGloveInfoImpl.cpp @@ -94,12 +94,7 @@ FSGNovaGloveInfoImpl FSGNovaGloveInfoImpl::Deserialize(const FString& Serialized } FSGNovaGloveInfoImpl::FSGNovaGloveInfoImpl() - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { } @@ -107,12 +102,7 @@ FSGNovaGloveInfoImpl::FSGNovaGloveInfoImpl( const FString& DeviceId, const FString& HardwareVersion, const int32 FirmwareVersion, const int32 SubFirmwareVersion, const bool bRightHanded, const FQuat& ImuCorrection, const int32 NumberOfSensors) - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { std::string DeviceIdString(TCHAR_TO_UTF8(*DeviceId)); std::string HardwareVersionString(TCHAR_TO_UTF8(*HardwareVersion)); @@ -124,32 +114,18 @@ FSGNovaGloveInfoImpl::FSGNovaGloveInfoImpl( } FSGNovaGloveInfoImpl::FSGNovaGloveInfoImpl(const FNovaGloveInfoType& GloveInfo) - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { Pimpl->NovaGloveInfo = GloveInfo; } FSGNovaGloveInfoImpl::FSGNovaGloveInfoImpl(const FSGNovaGloveInfoImpl& Rhs) - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl}, PimplDeleter)) { Pimpl->Owner = this; } -FSGNovaGloveInfoImpl::FSGNovaGloveInfoImpl(FSGNovaGloveInfoImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - = default; +FSGNovaGloveInfoImpl::FSGNovaGloveInfoImpl(FSGNovaGloveInfoImpl&& Rhs) SG_NOEXCEPT = default; FSGNovaGloveInfoImpl::~FSGNovaGloveInfoImpl() = default; @@ -160,11 +136,7 @@ FSGNovaGloveInfoImpl& FSGNovaGloveInfoImpl::operator=(const FSGNovaGloveInfoImpl return *this; } -FSGNovaGloveInfoImpl& FSGNovaGloveInfoImpl::operator=(FSGNovaGloveInfoImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - = default; +FSGNovaGloveInfoImpl& FSGNovaGloveInfoImpl::operator=(FSGNovaGloveInfoImpl&& Rhs) SG_NOEXCEPT = default; const FSGNovaGloveInfoImpl::FNovaGloveInfoType& FSGNovaGloveInfoImpl::ToNovaGloveInfo() const { diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGNovaGloveSensorDataImpl.cpp b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGNovaGloveSensorDataImpl.cpp index c3623216..92cfde9e 100644 --- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGNovaGloveSensorDataImpl.cpp +++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGNovaGloveSensorDataImpl.cpp @@ -101,24 +101,14 @@ FSGNovaGloveSensorDataImpl FSGNovaGloveSensorDataImpl::Deserialize(const FString } FSGNovaGloveSensorDataImpl::FSGNovaGloveSensorDataImpl() - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { } FSGNovaGloveSensorDataImpl::FSGNovaGloveSensorDataImpl(const TArray& Values, const int32 ParsedValues, const FQuat& ImuRotation, const bool bImuParsed, const float BatteryLevel, const bool bCharging) - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { std::vector ValuesVector{ FSGArrayUtils::ToStdVector( @@ -130,32 +120,18 @@ FSGNovaGloveSensorDataImpl::FSGNovaGloveSensorDataImpl(const TArray& Va } FSGNovaGloveSensorDataImpl::FSGNovaGloveSensorDataImpl(const FNovaGloveSensorDataType& NovaGloveSensorData) - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { Pimpl->NovaGloveSensorData = NovaGloveSensorData; } FSGNovaGloveSensorDataImpl::FSGNovaGloveSensorDataImpl(const FSGNovaGloveSensorDataImpl& Rhs) - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl}, PimplDeleter)) { Pimpl->Owner = this; } -FSGNovaGloveSensorDataImpl::FSGNovaGloveSensorDataImpl(FSGNovaGloveSensorDataImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - = default; +FSGNovaGloveSensorDataImpl::FSGNovaGloveSensorDataImpl(FSGNovaGloveSensorDataImpl&& Rhs) SG_NOEXCEPT = default; FSGNovaGloveSensorDataImpl::~FSGNovaGloveSensorDataImpl() = default; @@ -166,12 +142,8 @@ FSGNovaGloveSensorDataImpl& FSGNovaGloveSensorDataImpl::operator=(const FSGNovaG return *this; } -FSGNovaGloveSensorDataImpl& FSGNovaGloveSensorDataImpl::operator=(FSGNovaGloveSensorDataImpl&& Rhs - ) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - = default; +FSGNovaGloveSensorDataImpl& FSGNovaGloveSensorDataImpl::operator=(FSGNovaGloveSensorDataImpl&& Rhs) SG_NOEXCEPT += default; const FSGNovaGloveSensorDataImpl::FNovaGloveSensorDataType& FSGNovaGloveSensorDataImpl::ToNovaGloveSensorData( ) const diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGQuatImpl.cpp b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGQuatImpl.cpp index c6693c08..b73baf6e 100644 --- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGQuatImpl.cpp +++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGQuatImpl.cpp @@ -126,44 +126,24 @@ bool FSGQuatImpl::Deserialize(const FString& String, FSGQuatImpl& OutResult, con } FSGQuatImpl::FSGQuatImpl() - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { } FSGQuatImpl::FSGQuatImpl(const float X, const float Y, const float Z, const float W) - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { Pimpl->Quat = FQuatType(X, Y, Z, W); } FSGQuatImpl::FSGQuatImpl(const FQuatType& Quat) - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { Pimpl->Quat = Quat; } FSGQuatImpl::FSGQuatImpl(const FQuat& Quat) - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { /// NOTE /// Unreal Engine uses a left-handed, z-up world coordinate system, which yealds clockwise rotations: @@ -178,21 +158,12 @@ FSGQuatImpl::FSGQuatImpl(const FQuat& Quat) } FSGQuatImpl::FSGQuatImpl(const FSGQuatImpl& Rhs) - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl}, PimplDeleter)) { Pimpl->Owner = this; } -FSGQuatImpl::FSGQuatImpl(FSGQuatImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - = default; +FSGQuatImpl::FSGQuatImpl(FSGQuatImpl&& Rhs) SG_NOEXCEPT = default; FSGQuatImpl::~FSGQuatImpl() = default; @@ -203,11 +174,7 @@ FSGQuatImpl& FSGQuatImpl::operator=(const FSGQuatImpl& Rhs) return *this; } -FSGQuatImpl& FSGQuatImpl::operator=(FSGQuatImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - = default; +FSGQuatImpl& FSGQuatImpl::operator=(FSGQuatImpl&& Rhs) SG_NOEXCEPT = default; const FSGQuatImpl::FQuatType& FSGQuatImpl::ToQuat() const { @@ -225,7 +192,7 @@ FQuat FSGQuatImpl::ToFQuat() const /// Forward X /// Left Y /// Up Z - return FQuat(-Pimpl->Quat.GetX(), Pimpl->Quat.GetY(), -Pimpl->Quat.GetZ(), Pimpl->Quat.GetW()); + return FQuat(-Pimpl->Quat.GetX(), Pimpl->Quat.GetY(), -Pimpl->Quat.GetZ(), Pimpl->Quat.GetW()); } FSGQuatImpl FSGQuatImpl::operator*(const FSGQuatImpl& QuatImpl) const diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGQuatImpl.h b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGQuatImpl.h index c9e7bafc..450ceabc 100644 --- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGQuatImpl.h +++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGQuatImpl.h @@ -108,11 +108,7 @@ public: /** * The move constructor. */ - FSGQuatImpl(FSGQuatImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - ; + FSGQuatImpl(FSGQuatImpl&& Rhs) SG_NOEXCEPT; public: /** @@ -129,11 +125,7 @@ public: /** * The move assignment operator. */ - FSGQuatImpl& operator=(FSGQuatImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - ; + FSGQuatImpl& operator=(FSGQuatImpl&& Rhs) SG_NOEXCEPT; public: /** diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGSenseGloveHandProfileImpl.cpp b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGSenseGloveHandProfileImpl.cpp index 6d2ce951..4d11f640 100644 --- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGSenseGloveHandProfileImpl.cpp +++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGSenseGloveHandProfileImpl.cpp @@ -99,12 +99,7 @@ const FVector& FSGSenseGloveHandProfileImpl::GetDefaultThimbleOffset() } FSGSenseGloveHandProfileImpl::FSGSenseGloveHandProfileImpl() - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { } @@ -113,12 +108,7 @@ FSGSenseGloveHandProfileImpl::FSGSenseGloveHandProfileImpl(const bool bRightHand const ESGThumbSolver ThumbSolver, const ESGFingerSolver FingerSolver, const TArray& FingerThimbleOffset) - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { std::vector FingerThimbleOffsetVector{ FSGArrayUtils::ToMillimeters(FingerThimbleOffset) @@ -131,32 +121,18 @@ FSGSenseGloveHandProfileImpl::FSGSenseGloveHandProfileImpl(const bool bRightHand } FSGSenseGloveHandProfileImpl::FSGSenseGloveHandProfileImpl(const FSenseGloveHandProfileType& SenseGloveHandProfile) - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { Pimpl->SenseGloveHandProfile = SenseGloveHandProfile; } FSGSenseGloveHandProfileImpl::FSGSenseGloveHandProfileImpl(const FSGSenseGloveHandProfileImpl& Rhs) - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl}, PimplDeleter)) { Pimpl->Owner = this; } -FSGSenseGloveHandProfileImpl::FSGSenseGloveHandProfileImpl(FSGSenseGloveHandProfileImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - = default; +FSGSenseGloveHandProfileImpl::FSGSenseGloveHandProfileImpl(FSGSenseGloveHandProfileImpl&& Rhs) SG_NOEXCEPT = default; FSGSenseGloveHandProfileImpl::~FSGSenseGloveHandProfileImpl() = default; @@ -167,10 +143,7 @@ FSGSenseGloveHandProfileImpl& FSGSenseGloveHandProfileImpl::operator=(const FSGS return *this; } -FSGSenseGloveHandProfileImpl& FSGSenseGloveHandProfileImpl::operator=(FSGSenseGloveHandProfileImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ +FSGSenseGloveHandProfileImpl& FSGSenseGloveHandProfileImpl::operator=(FSGSenseGloveHandProfileImpl&& Rhs) SG_NOEXCEPT = default; const FSGSenseGloveHandProfileImpl::FSenseGloveHandProfileType& FSGSenseGloveHandProfileImpl::ToSenseGloveHandProfile( diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGSenseGloveImpl.cpp b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGSenseGloveImpl.cpp index dc39c147..67cf6c20 100644 --- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGSenseGloveImpl.cpp +++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGSenseGloveImpl.cpp @@ -248,60 +248,36 @@ void FSGSenseGloveImpl::CalculateWristLocation(const FVector& ReferencePosition, FSGSenseGloveImpl::FSGSenseGloveImpl() : FSGHapticGloveImpl(), -#if SG_CPP17 Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ { } FSGSenseGloveImpl::FSGSenseGloveImpl(const FSGSenseGloveInfoImpl& Model) : FSGHapticGloveImpl(std::make_shared(Model.ToSenseGloveInfo())), -#if SG_CPP17 Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ { } FSGSenseGloveImpl::FSGSenseGloveImpl(const FSenseGloveType SenseGlove) : FSGHapticGloveImpl(std::make_shared(SenseGlove)), -#if SG_CPP17 Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ { } FSGSenseGloveImpl::FSGSenseGloveImpl(const FSenseGlovePtrType SenseGlove) : FSGHapticGloveImpl(std::dynamic_pointer_cast(SenseGlove)), -#if SG_CPP17 Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ { } FSGSenseGloveImpl::FSGSenseGloveImpl(const FSGSenseGloveImpl& Rhs) : FSGHapticGloveImpl(Rhs), -#if SG_CPP17 Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl})) -#endif /* SG_CPP17 */ { Pimpl->Owner = this; } -FSGSenseGloveImpl::FSGSenseGloveImpl(FSGSenseGloveImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - = default; +FSGSenseGloveImpl::FSGSenseGloveImpl(FSGSenseGloveImpl&& Rhs) SG_NOEXCEPT = default; FSGSenseGloveImpl::~FSGSenseGloveImpl() = default; @@ -313,11 +289,7 @@ FSGSenseGloveImpl& FSGSenseGloveImpl::operator=(const FSGSenseGloveImpl& Rhs) return *this; } -FSGSenseGloveImpl& FSGSenseGloveImpl::operator=(FSGSenseGloveImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - = default; +FSGSenseGloveImpl& FSGSenseGloveImpl::operator=(FSGSenseGloveImpl&& Rhs) SG_NOEXCEPT = default; const FSGSenseGloveImpl::FSenseGloveType& FSGSenseGloveImpl::ToSenseGlove() const { diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGSenseGloveInfoImpl.cpp b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGSenseGloveInfoImpl.cpp index 758d39b6..855ec843 100644 --- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGSenseGloveInfoImpl.cpp +++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGSenseGloveInfoImpl.cpp @@ -98,12 +98,7 @@ FSGSenseGloveInfoImpl FSGSenseGloveInfoImpl::Deserialize(const FString& Serializ } FSGSenseGloveInfoImpl::FSGSenseGloveInfoImpl() - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { } @@ -116,12 +111,7 @@ FSGSenseGloveInfoImpl::FSGSenseGloveInfoImpl(const FString& DeviceId, const TArray& StartRotations, const TArray>& GloveLengths, const TArray& Functions) - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { std::string DeviceIdString(TCHAR_TO_UTF8(*DeviceId)); std::string HardwareVersionString(TCHAR_TO_UTF8(*HardwareVersion)); @@ -150,32 +140,18 @@ FSGSenseGloveInfoImpl::FSGSenseGloveInfoImpl(const FString& DeviceId, } FSGSenseGloveInfoImpl::FSGSenseGloveInfoImpl(const FSenseGloveInfoType& GloveInfo) - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { Pimpl->SenseGloveInfo = GloveInfo; } FSGSenseGloveInfoImpl::FSGSenseGloveInfoImpl(const FSGSenseGloveInfoImpl& Rhs) - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl}, PimplDeleter)) { Pimpl->Owner = this; } -FSGSenseGloveInfoImpl::FSGSenseGloveInfoImpl(FSGSenseGloveInfoImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - = default; +FSGSenseGloveInfoImpl::FSGSenseGloveInfoImpl(FSGSenseGloveInfoImpl&& Rhs) SG_NOEXCEPT = default; FSGSenseGloveInfoImpl::~FSGSenseGloveInfoImpl() = default; @@ -186,11 +162,7 @@ FSGSenseGloveInfoImpl& FSGSenseGloveInfoImpl::operator=(const FSGSenseGloveInfoI return *this; } -FSGSenseGloveInfoImpl& FSGSenseGloveInfoImpl::operator=(FSGSenseGloveInfoImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - = default; +FSGSenseGloveInfoImpl& FSGSenseGloveInfoImpl::operator=(FSGSenseGloveInfoImpl&& Rhs) SG_NOEXCEPT = default; const FSGSenseGloveInfoImpl::FSenseGloveInfoType& FSGSenseGloveInfoImpl::ToSenseGloveInfo() const { diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGSenseGlovePoseImpl.cpp b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGSenseGlovePoseImpl.cpp index 4200e914..cb7d3ca6 100644 --- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGSenseGlovePoseImpl.cpp +++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGSenseGlovePoseImpl.cpp @@ -93,24 +93,14 @@ FSGSenseGlovePoseImpl FSGSenseGlovePoseImpl::Deserialize(const FString& Serializ } FSGSenseGlovePoseImpl::FSGSenseGlovePoseImpl() - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { } FSGSenseGlovePoseImpl::FSGSenseGlovePoseImpl(const bool bRightHanded, const TArray>& JointPositions, const TArray>& JointRotations, const TArray>& GloveAngles) - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { std::vector> JointPositionsVector{ FSGArrayUtils::ToMillimeters(JointPositions) @@ -129,32 +119,18 @@ FSGSenseGlovePoseImpl::FSGSenseGlovePoseImpl(const bool bRightHanded, const TArr } FSGSenseGlovePoseImpl::FSGSenseGlovePoseImpl(const FSenseGlovePoseType& SenseGlovePose) - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { Pimpl->SenseGlovePose = SenseGlovePose; } FSGSenseGlovePoseImpl::FSGSenseGlovePoseImpl(const FSGSenseGlovePoseImpl& Rhs) - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl}, PimplDeleter)) { Pimpl->Owner = this; } -FSGSenseGlovePoseImpl::FSGSenseGlovePoseImpl(FSGSenseGlovePoseImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - = default; +FSGSenseGlovePoseImpl::FSGSenseGlovePoseImpl(FSGSenseGlovePoseImpl&& Rhs) SG_NOEXCEPT = default; FSGSenseGlovePoseImpl::~FSGSenseGlovePoseImpl() = default; @@ -165,11 +141,7 @@ FSGSenseGlovePoseImpl& FSGSenseGlovePoseImpl::operator=(const FSGSenseGlovePoseI return *this; } -FSGSenseGlovePoseImpl& FSGSenseGlovePoseImpl::operator=(FSGSenseGlovePoseImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - = default; +FSGSenseGlovePoseImpl& FSGSenseGlovePoseImpl::operator=(FSGSenseGlovePoseImpl&& Rhs) SG_NOEXCEPT = default; const FSGSenseGlovePoseImpl::FSenseGlovePoseType& FSGSenseGlovePoseImpl::ToSenseGlovePose() const { diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGSenseGloveSensorDataImpl.cpp b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGSenseGloveSensorDataImpl.cpp index 208ad8ea..ff13ea96 100644 --- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGSenseGloveSensorDataImpl.cpp +++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGSenseGloveSensorDataImpl.cpp @@ -100,24 +100,14 @@ FSGSenseGloveSensorDataImpl FSGSenseGloveSensorDataImpl::Deserialize(const FStri } FSGSenseGloveSensorDataImpl::FSGSenseGloveSensorDataImpl() - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { } FSGSenseGloveSensorDataImpl::FSGSenseGloveSensorDataImpl(const TArray>& SensorAngles, const FQuat& ImuRotation, const int32 ParsedValues, const bool bImuParsed) - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { std::vector> SensorAnglesVector{FSGArrayUtils::ToStdVector(SensorAngles)}; Pimpl->SenseGloveSensorData = FSenseGloveSensorDataType( @@ -125,32 +115,18 @@ FSGSenseGloveSensorDataImpl::FSGSenseGloveSensorDataImpl(const TArray(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { Pimpl->SenseGloveSensorData = SenseGloveSensorData; } FSGSenseGloveSensorDataImpl::FSGSenseGloveSensorDataImpl(const FSGSenseGloveSensorDataImpl& Rhs) - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl}, PimplDeleter)) { Pimpl->Owner = this; } -FSGSenseGloveSensorDataImpl::FSGSenseGloveSensorDataImpl(FSGSenseGloveSensorDataImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - = default; +FSGSenseGloveSensorDataImpl::FSGSenseGloveSensorDataImpl(FSGSenseGloveSensorDataImpl&& Rhs) SG_NOEXCEPT = default; FSGSenseGloveSensorDataImpl::~FSGSenseGloveSensorDataImpl() = default; @@ -161,12 +137,8 @@ FSGSenseGloveSensorDataImpl& FSGSenseGloveSensorDataImpl::operator=(const FSGSen return *this; } -FSGSenseGloveSensorDataImpl& FSGSenseGloveSensorDataImpl::operator=(FSGSenseGloveSensorDataImpl&& Rhs - ) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - = default; +FSGSenseGloveSensorDataImpl& FSGSenseGloveSensorDataImpl::operator=(FSGSenseGloveSensorDataImpl&& Rhs) SG_NOEXCEPT += default; const FSGSenseGloveSensorDataImpl::FSenseGloveSensorDataType& FSGSenseGloveSensorDataImpl::ToSenseGloveSensorData( ) const diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGSensorRangeImpl.cpp b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGSensorRangeImpl.cpp index 7d08c5a3..1b196598 100644 --- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGSensorRangeImpl.cpp +++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGSensorRangeImpl.cpp @@ -105,22 +105,12 @@ void FSGSensorRangeImpl::CheckMin(const FVector& CurrentValues, FVector& OutMinV } FSGSensorRangeImpl::FSGSensorRangeImpl() - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { } FSGSensorRangeImpl::FSGSensorRangeImpl(const TArray& MinValues, const TArray& MaxValues) - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { std::vector MinValuesVector( FSGArrayUtils::ToStdVector( @@ -132,32 +122,18 @@ FSGSensorRangeImpl::FSGSensorRangeImpl(const TArray& MinValues, const T } FSGSensorRangeImpl::FSGSensorRangeImpl(const FSensorRangeType& SensorRange) - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { Pimpl->SensorRange = SensorRange; } FSGSensorRangeImpl::FSGSensorRangeImpl(const FSGSensorRangeImpl& Rhs) - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl}, PimplDeleter)) { Pimpl->Owner = this; } -FSGSensorRangeImpl::FSGSensorRangeImpl(FSGSensorRangeImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - = default; +FSGSensorRangeImpl::FSGSensorRangeImpl(FSGSensorRangeImpl&& Rhs) SG_NOEXCEPT = default; FSGSensorRangeImpl::~FSGSensorRangeImpl() = default; @@ -168,11 +144,7 @@ FSGSensorRangeImpl& FSGSensorRangeImpl::operator=(const FSGSensorRangeImpl& Rhs) return *this; } -FSGSensorRangeImpl& FSGSensorRangeImpl::operator=(FSGSensorRangeImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - = default; +FSGSensorRangeImpl& FSGSensorRangeImpl::operator=(FSGSensorRangeImpl&& Rhs) SG_NOEXCEPT = default; const FSGSensorRangeImpl::FSensorRangeType& FSGSensorRangeImpl::ToSensorRange() const { diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGThumperCommandImpl.cpp b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGThumperCommandImpl.cpp index 153a4f14..2726d84f 100644 --- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGThumperCommandImpl.cpp +++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGThumperCommandImpl.cpp @@ -75,53 +75,29 @@ const FSGThumperCommandImpl& FSGThumperCommandImpl::Off() } FSGThumperCommandImpl::FSGThumperCommandImpl() - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { } FSGThumperCommandImpl::FSGThumperCommandImpl(const int32 Magnitude) - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { Pimpl->ThumperCommand = FThumperCommandType(Magnitude); } FSGThumperCommandImpl::FSGThumperCommandImpl(const FThumperCommandType& ThumperCommand) - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { Pimpl->ThumperCommand = ThumperCommand; } FSGThumperCommandImpl::FSGThumperCommandImpl(const FSGThumperCommandImpl& Rhs) - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl}, PimplDeleter)) { Pimpl->Owner = this; } -FSGThumperCommandImpl::FSGThumperCommandImpl(FSGThumperCommandImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - = default; +FSGThumperCommandImpl::FSGThumperCommandImpl(FSGThumperCommandImpl&& Rhs) SG_NOEXCEPT = default; FSGThumperCommandImpl::~FSGThumperCommandImpl() = default; @@ -132,11 +108,7 @@ FSGThumperCommandImpl& FSGThumperCommandImpl::operator=(const FSGThumperCommandI return *this; } -FSGThumperCommandImpl& FSGThumperCommandImpl::operator=(FSGThumperCommandImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - = default; +FSGThumperCommandImpl& FSGThumperCommandImpl::operator=(FSGThumperCommandImpl&& Rhs) SG_NOEXCEPT = default; const FSGThumperCommandImpl::FThumperCommandType& FSGThumperCommandImpl::ToThumperCommand() const { diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGTimedBuzzCommandImpl.cpp b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGTimedBuzzCommandImpl.cpp index 13559919..0eae11c6 100644 --- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGTimedBuzzCommandImpl.cpp +++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGTimedBuzzCommandImpl.cpp @@ -69,11 +69,7 @@ struct FSGTimedBuzzCommandImpl::FImpl FSGTimedBuzzCommandImpl::FSGTimedBuzzCommandImpl() : FSGBuzzCommandImpl(MakeShared()), -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { } @@ -81,62 +77,38 @@ FSGTimedBuzzCommandImpl::FSGTimedBuzzCommandImpl(const ESGFinger Finger, const i const float DurationSeconds, const float StartTimeSeconds) : FSGBuzzCommandImpl(MakeShared(FSGCoreEnumCast::ToEFinger(Finger), Magnitude, DurationSeconds, StartTimeSeconds)), -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { } FSGTimedBuzzCommandImpl::FSGTimedBuzzCommandImpl(const FSGBuzzCommandImpl& BaseCommand, const float DurationSeconds, const float StartTimeSeconds) : FSGBuzzCommandImpl(MakeShared( - BaseCommand.ToBuzzCommand(), DurationSeconds, StartTimeSeconds)), -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + BaseCommand.ToBuzzCommand(), DurationSeconds, StartTimeSeconds)), + Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { } FSGTimedBuzzCommandImpl::FSGTimedBuzzCommandImpl(const FTimedBuzzCommandType& TimedBuzzCommand) : FSGBuzzCommandImpl(MakeShared(TimedBuzzCommand)), -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { } FSGTimedBuzzCommandImpl::FSGTimedBuzzCommandImpl(const TSharedRef TimedBuzzCommand) : FSGBuzzCommandImpl(TimedBuzzCommand), -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { } FSGTimedBuzzCommandImpl::FSGTimedBuzzCommandImpl(const FSGTimedBuzzCommandImpl& Rhs) : FSGBuzzCommandImpl(Rhs), -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl})) -#endif /* SG_CPP17 */ + Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl}, PimplDeleter)) { Pimpl->Owner = this; } -FSGTimedBuzzCommandImpl::FSGTimedBuzzCommandImpl(FSGTimedBuzzCommandImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - = default; +FSGTimedBuzzCommandImpl::FSGTimedBuzzCommandImpl(FSGTimedBuzzCommandImpl&& Rhs) SG_NOEXCEPT = default; FSGTimedBuzzCommandImpl::~FSGTimedBuzzCommandImpl() = default; @@ -148,11 +120,7 @@ FSGTimedBuzzCommandImpl& FSGTimedBuzzCommandImpl::operator=(const FSGTimedBuzzCo return *this; } -FSGTimedBuzzCommandImpl& FSGTimedBuzzCommandImpl::operator=(FSGTimedBuzzCommandImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - = default; +FSGTimedBuzzCommandImpl& FSGTimedBuzzCommandImpl::operator=(FSGTimedBuzzCommandImpl&& Rhs) SG_NOEXCEPT = default; const FSGTimedBuzzCommandImpl::FTimedBuzzCommandType& FSGTimedBuzzCommandImpl::ToTimedBuzzCommand() const { diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGTimedThumpCommandImpl.cpp b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGTimedThumpCommandImpl.cpp index 084f4c82..a23f0ab3 100644 --- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGTimedThumpCommandImpl.cpp +++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGTimedThumpCommandImpl.cpp @@ -71,67 +71,38 @@ struct FSGTimedThumpCommandImpl::FImpl }; FSGTimedThumpCommandImpl::FSGTimedThumpCommandImpl() - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { } FSGTimedThumpCommandImpl::FSGTimedThumpCommandImpl(const int32 Magnitude, const float DurationSeconds, const float StartTimeSeconds) - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { Pimpl->TimedThumpCommand = FTimedThumpCommandType(Magnitude, DurationSeconds, StartTimeSeconds); } FSGTimedThumpCommandImpl::FSGTimedThumpCommandImpl(const FSGThumperCommandImpl& BaseCommand, const float DurationSeconds, const float StartTimeSeconds) - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { Pimpl->TimedThumpCommand = FTimedThumpCommandType(BaseCommand.ToThumperCommand(), DurationSeconds, StartTimeSeconds); } FSGTimedThumpCommandImpl::FSGTimedThumpCommandImpl(const FTimedThumpCommandType& SGTimedThumpCommand) - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { Pimpl->TimedThumpCommand = SGTimedThumpCommand; } FSGTimedThumpCommandImpl::FSGTimedThumpCommandImpl(const FSGTimedThumpCommandImpl& Rhs) - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl}, PimplDeleter)) { Pimpl->Owner = this; } -FSGTimedThumpCommandImpl::FSGTimedThumpCommandImpl(FSGTimedThumpCommandImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - = default; +FSGTimedThumpCommandImpl::FSGTimedThumpCommandImpl(FSGTimedThumpCommandImpl&& Rhs) SG_NOEXCEPT = default; FSGTimedThumpCommandImpl::~FSGTimedThumpCommandImpl() = default; @@ -142,11 +113,7 @@ FSGTimedThumpCommandImpl& FSGTimedThumpCommandImpl::operator=(const FSGTimedThum return *this; } -FSGTimedThumpCommandImpl& FSGTimedThumpCommandImpl::operator=(FSGTimedThumpCommandImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - = default; +FSGTimedThumpCommandImpl& FSGTimedThumpCommandImpl::operator=(FSGTimedThumpCommandImpl&& Rhs) SG_NOEXCEPT = default; const FSGTimedThumpCommandImpl::FTimedThumpCommandType& FSGTimedThumpCommandImpl::ToTimedThumpCommand() const { diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGVect3DImpl.cpp b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGVect3DImpl.cpp index 2bd20a3a..69f812bf 100644 --- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGVect3DImpl.cpp +++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGVect3DImpl.cpp @@ -84,44 +84,24 @@ bool FSGVect3DImpl::Deserialize(const FString& String, FSGVect3DImpl& OutResult, } FSGVect3DImpl::FSGVect3DImpl() - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { } FSGVect3DImpl::FSGVect3DImpl(const float X, const float Y, const float Z) - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { Pimpl->Vect3D = FVect3DType(X, Y, Z); } FSGVect3DImpl::FSGVect3DImpl(const FVect3DType& Vect3D) - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { Pimpl->Vect3D = Vect3D; } FSGVect3DImpl::FSGVect3DImpl(const FVector& Vector) - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{this})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { /// NOTE /// Unreal Engine uses a left-handed, z-up world coordinate system, which yealds clockwise rotations: @@ -138,21 +118,12 @@ FSGVect3DImpl::FSGVect3DImpl(const FVector& Vector) } FSGVect3DImpl::FSGVect3DImpl(const FSGVect3DImpl& Rhs) - : -#if SG_CPP17 - Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl}, PimplDeleter)) -#else - Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl})) -#endif /* SG_CPP17 */ + : Pimpl(TUniquePtr(new FImpl{*Rhs.Pimpl}, PimplDeleter)) { Pimpl->Owner = this; } -FSGVect3DImpl::FSGVect3DImpl(FSGVect3DImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - = default; +FSGVect3DImpl::FSGVect3DImpl(FSGVect3DImpl&& Rhs) SG_NOEXCEPT = default; FSGVect3DImpl::~FSGVect3DImpl() = default; @@ -163,11 +134,7 @@ FSGVect3DImpl& FSGVect3DImpl::operator=(const FSGVect3DImpl& Rhs) return *this; } -FSGVect3DImpl& FSGVect3DImpl::operator=(FSGVect3DImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - = default; +FSGVect3DImpl& FSGVect3DImpl::operator=(FSGVect3DImpl&& Rhs) SG_NOEXCEPT = default; const FSGVect3DImpl::FVect3DType& FSGVect3DImpl::ToVect3D() const { diff --git a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGVect3DImpl.h b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGVect3DImpl.h index 6fb9b7ae..d5b5f886 100644 --- a/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGVect3DImpl.h +++ b/Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGVect3DImpl.h @@ -108,11 +108,7 @@ public: /** * The move constructor. */ - FSGVect3DImpl(FSGVect3DImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - ; + FSGVect3DImpl(FSGVect3DImpl&& Rhs) SG_NOEXCEPT; public: /** @@ -129,11 +125,7 @@ public: /** * The move assignment operator. */ - FSGVect3DImpl& operator=(FSGVect3DImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - ; + FSGVect3DImpl& operator=(FSGVect3DImpl&& Rhs) SG_NOEXCEPT; public: /** diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGBasicHandModelImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGBasicHandModelImpl.h index 271d4cf3..a142781f 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGBasicHandModelImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGBasicHandModelImpl.h @@ -104,11 +104,7 @@ public: /** * The move constructor. */ - FSGBasicHandModelImpl(FSGBasicHandModelImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - ; + FSGBasicHandModelImpl(FSGBasicHandModelImpl&& Rhs) SG_NOEXCEPT; public: /** @@ -125,11 +121,7 @@ public: /** * The move assignment operator. */ - FSGBasicHandModelImpl& operator=(FSGBasicHandModelImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - ; + FSGBasicHandModelImpl& operator=(FSGBasicHandModelImpl&& Rhs) SG_NOEXCEPT; public: /** diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGBetaDeviceImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGBetaDeviceImpl.h index b265b895..9aa08659 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGBetaDeviceImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGBetaDeviceImpl.h @@ -106,11 +106,7 @@ public: /** * The move constructor. */ - FSGBetaDeviceImpl(FSGBetaDeviceImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - ; + FSGBetaDeviceImpl(FSGBetaDeviceImpl&& Rhs) SG_NOEXCEPT; public: /** @@ -127,11 +123,7 @@ public: /** * The move assignment operator. */ - FSGBetaDeviceImpl& operator=(FSGBetaDeviceImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - ; + FSGBetaDeviceImpl& operator=(FSGBetaDeviceImpl&& Rhs) SG_NOEXCEPT; public: /** diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGBuzzCommandImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGBuzzCommandImpl.h index 55f5394a..67db418e 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGBuzzCommandImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGBuzzCommandImpl.h @@ -101,11 +101,7 @@ public: /** * The move constructor */ - FSGBuzzCommandImpl(FSGBuzzCommandImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - ; + FSGBuzzCommandImpl(FSGBuzzCommandImpl&& Rhs) SG_NOEXCEPT; public: /** @@ -122,11 +118,7 @@ public: /** * The move assignment operator. */ - FSGBuzzCommandImpl& operator=(FSGBuzzCommandImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - ; + FSGBuzzCommandImpl& operator=(FSGBuzzCommandImpl&& Rhs) SG_NOEXCEPT; public: /** diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGCalibrationDataPointImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGCalibrationDataPointImpl.h index 42cea2a9..d583876b 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGCalibrationDataPointImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGCalibrationDataPointImpl.h @@ -85,11 +85,7 @@ public: /** * The move constructor. */ - FSGCalibrationDataPointImpl(FSGCalibrationDataPointImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - ; + FSGCalibrationDataPointImpl(FSGCalibrationDataPointImpl&& Rhs) SG_NOEXCEPT; public: /** @@ -106,11 +102,7 @@ public: /** * The move assignment operator. */ - FSGCalibrationDataPointImpl& operator=(FSGCalibrationDataPointImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - ; + FSGCalibrationDataPointImpl& operator=(FSGCalibrationDataPointImpl&& Rhs) SG_NOEXCEPT; public: /** diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGDeviceImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGDeviceImpl.h index 94dd4b3f..f08d08e7 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGDeviceImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGDeviceImpl.h @@ -97,11 +97,7 @@ public: /** * The move constructor. */ - FSGDeviceImpl(FSGDeviceImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - ; + FSGDeviceImpl(FSGDeviceImpl&& Rhs) SG_NOEXCEPT; public: /** @@ -118,11 +114,7 @@ public: /** * The move assignment operator. */ - FSGDeviceImpl& operator=(FSGDeviceImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - ; + FSGDeviceImpl& operator=(FSGDeviceImpl&& Rhs) SG_NOEXCEPT; public: /** diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGDeviceModelImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGDeviceModelImpl.h index af569822..6e74e303 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGDeviceModelImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGDeviceModelImpl.h @@ -88,11 +88,7 @@ public: /** * The move constructor. */ - FSGDeviceModelImpl(FSGDeviceModelImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - ; + FSGDeviceModelImpl(FSGDeviceModelImpl&& Rhs) SG_NOEXCEPT; public: /** @@ -109,11 +105,7 @@ public: /** * The move assignment operator. */ - FSGDeviceModelImpl& operator=(FSGDeviceModelImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - ; + FSGDeviceModelImpl& operator=(FSGDeviceModelImpl&& Rhs) SG_NOEXCEPT; public: /** diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGFingerCommandImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGFingerCommandImpl.h index bad328ff..23392c7e 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGFingerCommandImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGFingerCommandImpl.h @@ -96,11 +96,7 @@ public: /** * The move constructor */ - FSGFingerCommandImpl(FSGFingerCommandImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - ; + FSGFingerCommandImpl(FSGFingerCommandImpl&& Rhs) SG_NOEXCEPT; public: /** @@ -117,11 +113,7 @@ public: /** * The move assignment operator. */ - FSGFingerCommandImpl& operator=(FSGFingerCommandImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - ; + FSGFingerCommandImpl& operator=(FSGFingerCommandImpl&& Rhs) SG_NOEXCEPT; public: /** diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGForceFeedbackCommandImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGForceFeedbackCommandImpl.h index b3a9773b..e02badec 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGForceFeedbackCommandImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGForceFeedbackCommandImpl.h @@ -101,11 +101,7 @@ public: /** * The move constructor */ - FSGForceFeedbackCommandImpl(FSGForceFeedbackCommandImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - ; + FSGForceFeedbackCommandImpl(FSGForceFeedbackCommandImpl&& Rhs) SG_NOEXCEPT; public: /** @@ -122,11 +118,7 @@ public: /** * The move assignment operator. */ - FSGForceFeedbackCommandImpl& operator=(FSGForceFeedbackCommandImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - ; + FSGForceFeedbackCommandImpl& operator=(FSGForceFeedbackCommandImpl&& Rhs) SG_NOEXCEPT; public: /** diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHandInterpolatorImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHandInterpolatorImpl.h index 98f9d85f..7075fe7c 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHandInterpolatorImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHandInterpolatorImpl.h @@ -108,11 +108,7 @@ public: /** * The move constructor. */ - FSGHandInterpolatorImpl(FSGHandInterpolatorImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - ; + FSGHandInterpolatorImpl(FSGHandInterpolatorImpl&& Rhs) SG_NOEXCEPT; public: /** @@ -129,11 +125,7 @@ public: /** * The move assignment operator. */ - FSGHandInterpolatorImpl& operator=(FSGHandInterpolatorImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - ; + FSGHandInterpolatorImpl& operator=(FSGHandInterpolatorImpl&& Rhs) SG_NOEXCEPT; public: /** diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHandPoseImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHandPoseImpl.h index d0345520..37e9f164 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHandPoseImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHandPoseImpl.h @@ -113,11 +113,7 @@ public: /** * The move constructor. */ - FSGHandPoseImpl(FSGHandPoseImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - ; + FSGHandPoseImpl(FSGHandPoseImpl&& Rhs) SG_NOEXCEPT; public: /** @@ -134,11 +130,7 @@ public: /** * The move assignment operator. */ - FSGHandPoseImpl& operator=(FSGHandPoseImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - ; + FSGHandPoseImpl& operator=(FSGHandPoseImpl&& Rhs) SG_NOEXCEPT; public: /** diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHandProfileImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHandProfileImpl.h index 26b59e2e..60d6f283 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHandProfileImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHandProfileImpl.h @@ -111,11 +111,7 @@ public: /** * The move constructor. */ - FSGHandProfileImpl(FSGHandProfileImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - ; + FSGHandProfileImpl(FSGHandProfileImpl&& Rhs) SG_NOEXCEPT; public: /** @@ -132,11 +128,7 @@ public: /** * The move assignment operator. */ - FSGHandProfileImpl& operator=(FSGHandProfileImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - ; + FSGHandProfileImpl& operator=(FSGHandProfileImpl&& Rhs) SG_NOEXCEPT; public: /** diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHapticGloveCalibrationCheckImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHapticGloveCalibrationCheckImpl.h index 33cf5ec4..9838df82 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHapticGloveCalibrationCheckImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHapticGloveCalibrationCheckImpl.h @@ -114,11 +114,7 @@ public: /** * The move constructor. */ - FSGHapticGloveCalibrationCheckImpl(FSGHapticGloveCalibrationCheckImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - ; + FSGHapticGloveCalibrationCheckImpl(FSGHapticGloveCalibrationCheckImpl&& Rhs) SG_NOEXCEPT; public: /** @@ -135,11 +131,7 @@ public: /** * The move assignment operator. */ - FSGHapticGloveCalibrationCheckImpl& operator=(FSGHapticGloveCalibrationCheckImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - ; + FSGHapticGloveCalibrationCheckImpl& operator=(FSGHapticGloveCalibrationCheckImpl&& Rhs) SG_NOEXCEPT; public: /** diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHapticGloveCalibrationSequenceImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHapticGloveCalibrationSequenceImpl.h index e1468180..a98726a4 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHapticGloveCalibrationSequenceImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHapticGloveCalibrationSequenceImpl.h @@ -111,11 +111,7 @@ public: /** * The move constructor. */ - FSGHapticGloveCalibrationSequenceImpl(FSGHapticGloveCalibrationSequenceImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - ; + FSGHapticGloveCalibrationSequenceImpl(FSGHapticGloveCalibrationSequenceImpl&& Rhs) SG_NOEXCEPT; public: /** @@ -132,11 +128,7 @@ public: /** * The move assignment operator. */ - FSGHapticGloveCalibrationSequenceImpl& operator=(FSGHapticGloveCalibrationSequenceImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - ; + FSGHapticGloveCalibrationSequenceImpl& operator=(FSGHapticGloveCalibrationSequenceImpl&& Rhs) SG_NOEXCEPT; public: /** diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHapticGloveCommandBufferImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHapticGloveCommandBufferImpl.h index 4afe1db7..bf14b32b 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHapticGloveCommandBufferImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHapticGloveCommandBufferImpl.h @@ -98,11 +98,7 @@ public: /** * The move constructor. */ - FSGHapticGloveCommandBufferImpl(FSGHapticGloveCommandBufferImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - ; + FSGHapticGloveCommandBufferImpl(FSGHapticGloveCommandBufferImpl&& Rhs) SG_NOEXCEPT; public: /** @@ -119,11 +115,7 @@ public: /** * The move assignment operator. */ - FSGHapticGloveCommandBufferImpl& operator=(FSGHapticGloveCommandBufferImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - ; + FSGHapticGloveCommandBufferImpl& operator=(FSGHapticGloveCommandBufferImpl&& Rhs) SG_NOEXCEPT; public: /** diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHapticGloveImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHapticGloveImpl.h index 8526730f..e2d541e4 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHapticGloveImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHapticGloveImpl.h @@ -112,11 +112,7 @@ public: /** * The move constructor. */ - FSGHapticGloveImpl(FSGHapticGloveImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - ; + FSGHapticGloveImpl(FSGHapticGloveImpl&& Rhs) SG_NOEXCEPT; public: /** @@ -133,11 +129,7 @@ public: /** * The move assignment operator. */ - FSGHapticGloveImpl& operator=(FSGHapticGloveImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - ; + FSGHapticGloveImpl& operator=(FSGHapticGloveImpl&& Rhs) SG_NOEXCEPT; public: /** diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHapticGloveQuickCalibrationImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHapticGloveQuickCalibrationImpl.h index 933862b1..d7e1aa81 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHapticGloveQuickCalibrationImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGHapticGloveQuickCalibrationImpl.h @@ -96,11 +96,7 @@ public: /** * The move constructor. */ - FSGHapticGloveQuickCalibrationImpl(FSGHapticGloveQuickCalibrationImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - ; + FSGHapticGloveQuickCalibrationImpl(FSGHapticGloveQuickCalibrationImpl&& Rhs) SG_NOEXCEPT; public: /** @@ -117,11 +113,7 @@ public: /** * The move assignment operator. */ - FSGHapticGloveQuickCalibrationImpl& operator=(FSGHapticGloveQuickCalibrationImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - ; + FSGHapticGloveQuickCalibrationImpl& operator=(FSGHapticGloveQuickCalibrationImpl&& Rhs) SG_NOEXCEPT; public: /** diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGInterpolationSetImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGInterpolationSetImpl.h index 53d00c73..1be7be05 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGInterpolationSetImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGInterpolationSetImpl.h @@ -90,11 +90,7 @@ public: /** * The move constructor. */ - FSGInterpolationSetImpl(FSGInterpolationSetImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - ; + FSGInterpolationSetImpl(FSGInterpolationSetImpl&& Rhs) SG_NOEXCEPT; public: /** @@ -111,11 +107,7 @@ public: /** * The move assignment operator. */ - FSGInterpolationSetImpl& operator=(FSGInterpolationSetImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - ; + FSGInterpolationSetImpl& operator=(FSGInterpolationSetImpl&& Rhs) SG_NOEXCEPT; public: /** diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGNovaGloveHandProfileImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGNovaGloveHandProfileImpl.h index ead79a88..9bf92dbf 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGNovaGloveHandProfileImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGNovaGloveHandProfileImpl.h @@ -92,11 +92,7 @@ public: /** * The move constructor. */ - FSGNovaGloveHandProfileImpl(FSGNovaGloveHandProfileImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - ; + FSGNovaGloveHandProfileImpl(FSGNovaGloveHandProfileImpl&& Rhs) SG_NOEXCEPT; public: /** @@ -113,11 +109,7 @@ public: /** * The move assignment operator. */ - FSGNovaGloveHandProfileImpl& operator=(FSGNovaGloveHandProfileImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - ; + FSGNovaGloveHandProfileImpl& operator=(FSGNovaGloveHandProfileImpl&& Rhs) SG_NOEXCEPT; public: /** diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGNovaGloveImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGNovaGloveImpl.h index 90200a6e..a23b8e32 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGNovaGloveImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGNovaGloveImpl.h @@ -158,11 +158,7 @@ public: /** * The move constructor. */ - FSGNovaGloveImpl(FSGNovaGloveImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - ; + FSGNovaGloveImpl(FSGNovaGloveImpl&& Rhs) SG_NOEXCEPT; public: /** @@ -179,11 +175,7 @@ public: /** * The move assignment operator. */ - FSGNovaGloveImpl& operator=(FSGNovaGloveImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - ; + FSGNovaGloveImpl& operator=(FSGNovaGloveImpl&& Rhs) SG_NOEXCEPT; public: /** diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGNovaGloveInfoImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGNovaGloveInfoImpl.h index 4f26f81f..daf4ffa1 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGNovaGloveInfoImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGNovaGloveInfoImpl.h @@ -93,11 +93,7 @@ public: /** * The move constructor. */ - FSGNovaGloveInfoImpl(FSGNovaGloveInfoImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - ; + FSGNovaGloveInfoImpl(FSGNovaGloveInfoImpl&& Rhs) SG_NOEXCEPT; public: /** @@ -114,11 +110,7 @@ public: /** * The move assignment operator. */ - FSGNovaGloveInfoImpl& operator=(FSGNovaGloveInfoImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - ; + FSGNovaGloveInfoImpl& operator=(FSGNovaGloveInfoImpl&& Rhs) SG_NOEXCEPT; public: /** diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGNovaGloveSensorDataImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGNovaGloveSensorDataImpl.h index fc94ed83..46ecd977 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGNovaGloveSensorDataImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGNovaGloveSensorDataImpl.h @@ -96,11 +96,7 @@ public: /** * The move constructor. */ - FSGNovaGloveSensorDataImpl(FSGNovaGloveSensorDataImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - ; + FSGNovaGloveSensorDataImpl(FSGNovaGloveSensorDataImpl&& Rhs) SG_NOEXCEPT; public: /** @@ -117,11 +113,7 @@ public: /** * The move assignment operator. */ - FSGNovaGloveSensorDataImpl& operator=(FSGNovaGloveSensorDataImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - ; + FSGNovaGloveSensorDataImpl& operator=(FSGNovaGloveSensorDataImpl&& Rhs) SG_NOEXCEPT; public: /** diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGPlatform.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGPlatform.h index 82f42ac5..7bb42143 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGPlatform.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGPlatform.h @@ -39,4 +39,10 @@ #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 ) */ \ No newline at end of file +#endif /* ( ( defined( _MSVC_LANG ) && _MSVC_LANG >= 201703L ) || __cplusplus >= 201703L ) */ + +#if SG_CPP17 +#define SG_NOEXCEPT noexcept +#else /* SG_CPP17 */ +#define SG_NOEXCEPT +#endif /* SG_CPP17 */ \ No newline at end of file diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGSenseGloveHandProfileImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGSenseGloveHandProfileImpl.h index 0bc94881..1152b5f6 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGSenseGloveHandProfileImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGSenseGloveHandProfileImpl.h @@ -99,11 +99,7 @@ public: /** * The move constructor. */ - FSGSenseGloveHandProfileImpl(FSGSenseGloveHandProfileImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - ; + FSGSenseGloveHandProfileImpl(FSGSenseGloveHandProfileImpl&& Rhs) SG_NOEXCEPT; public: /** @@ -120,11 +116,7 @@ public: /** * The move assignment operator. */ - FSGSenseGloveHandProfileImpl& operator=(FSGSenseGloveHandProfileImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - ; + FSGSenseGloveHandProfileImpl& operator=(FSGSenseGloveHandProfileImpl&& Rhs) SG_NOEXCEPT; public: /** diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGSenseGloveImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGSenseGloveImpl.h index 7742568a..2b55dd0c 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGSenseGloveImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGSenseGloveImpl.h @@ -163,11 +163,7 @@ public: /** * The move constructor. */ - FSGSenseGloveImpl(FSGSenseGloveImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - ; + FSGSenseGloveImpl(FSGSenseGloveImpl&& Rhs) SG_NOEXCEPT; public: /** @@ -184,11 +180,7 @@ public: /** * The move assignment operator. */ - FSGSenseGloveImpl& operator=(FSGSenseGloveImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - ; + FSGSenseGloveImpl& operator=(FSGSenseGloveImpl&& Rhs) SG_NOEXCEPT; public: /** diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGSenseGloveInfoImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGSenseGloveInfoImpl.h index 35a3985e..4b3032c4 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGSenseGloveInfoImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGSenseGloveInfoImpl.h @@ -100,11 +100,7 @@ public: /** * The move constructor. */ - FSGSenseGloveInfoImpl(FSGSenseGloveInfoImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - ; + FSGSenseGloveInfoImpl(FSGSenseGloveInfoImpl&& Rhs) SG_NOEXCEPT; public: /** @@ -121,11 +117,7 @@ public: /** * The move assignment operator. */ - FSGSenseGloveInfoImpl& operator=(FSGSenseGloveInfoImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - ; + FSGSenseGloveInfoImpl& operator=(FSGSenseGloveInfoImpl&& Rhs) SG_NOEXCEPT; public: /** diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGSenseGlovePoseImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGSenseGlovePoseImpl.h index 4ddc6763..580f6f90 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGSenseGlovePoseImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGSenseGlovePoseImpl.h @@ -97,11 +97,7 @@ public: /** * The move constructor. */ - FSGSenseGlovePoseImpl(FSGSenseGlovePoseImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - ; + FSGSenseGlovePoseImpl(FSGSenseGlovePoseImpl&& Rhs) SG_NOEXCEPT; public: /** @@ -118,11 +114,7 @@ public: /** * The move assignment operator. */ - FSGSenseGlovePoseImpl& operator=(FSGSenseGlovePoseImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - ; + FSGSenseGlovePoseImpl& operator=(FSGSenseGlovePoseImpl&& Rhs) SG_NOEXCEPT; public: /** diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGSenseGloveSensorDataImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGSenseGloveSensorDataImpl.h index ae021a15..8228cd9e 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGSenseGloveSensorDataImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGSenseGloveSensorDataImpl.h @@ -96,11 +96,7 @@ public: /** * The move constructor. */ - FSGSenseGloveSensorDataImpl(FSGSenseGloveSensorDataImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - ; + FSGSenseGloveSensorDataImpl(FSGSenseGloveSensorDataImpl&& Rhs) SG_NOEXCEPT; public: /** @@ -117,11 +113,7 @@ public: /** * The move assignment operator. */ - FSGSenseGloveSensorDataImpl& operator=(FSGSenseGloveSensorDataImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - ; + FSGSenseGloveSensorDataImpl& operator=(FSGSenseGloveSensorDataImpl&& Rhs) SG_NOEXCEPT; public: /** diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGSensorRangeImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGSensorRangeImpl.h index 19df1bc4..144b7800 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGSensorRangeImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGSensorRangeImpl.h @@ -95,11 +95,7 @@ public: /** * The move constructor. */ - FSGSensorRangeImpl(FSGSensorRangeImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - ; + FSGSensorRangeImpl(FSGSensorRangeImpl&& Rhs) SG_NOEXCEPT; public: /** @@ -116,11 +112,7 @@ public: /** * The move assignment operator. */ - FSGSensorRangeImpl& operator=(FSGSensorRangeImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - ; + FSGSensorRangeImpl& operator=(FSGSensorRangeImpl&& Rhs) SG_NOEXCEPT; public: /** diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGThumperCommandImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGThumperCommandImpl.h index 799ae446..c0da20e0 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGThumperCommandImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGThumperCommandImpl.h @@ -87,11 +87,7 @@ public: /** * The move constructor */ - FSGThumperCommandImpl(FSGThumperCommandImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - ; + FSGThumperCommandImpl(FSGThumperCommandImpl&& Rhs) SG_NOEXCEPT; public: /** @@ -108,11 +104,7 @@ public: /** * The move assignment operator. */ - FSGThumperCommandImpl& operator=(FSGThumperCommandImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - ; + FSGThumperCommandImpl& operator=(FSGThumperCommandImpl&& Rhs) SG_NOEXCEPT; public: /** diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGTimedBuzzCommandImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGTimedBuzzCommandImpl.h index 8d183f7d..7f77deea 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGTimedBuzzCommandImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGTimedBuzzCommandImpl.h @@ -98,11 +98,7 @@ public: /** * The move constructor */ - FSGTimedBuzzCommandImpl(FSGTimedBuzzCommandImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - ; + FSGTimedBuzzCommandImpl(FSGTimedBuzzCommandImpl&& Rhs) SG_NOEXCEPT; public: /** @@ -119,11 +115,7 @@ public: /** * The move assignment operator. */ - FSGTimedBuzzCommandImpl& operator=(FSGTimedBuzzCommandImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - ; + FSGTimedBuzzCommandImpl& operator=(FSGTimedBuzzCommandImpl&& Rhs) SG_NOEXCEPT; public: /** diff --git a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGTimedThumpCommandImpl.h b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGTimedThumpCommandImpl.h index faf25b21..60f478f1 100644 --- a/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGTimedThumpCommandImpl.h +++ b/Source/SenseGloveCoreImpl/Public/SGCoreImpl/SGTimedThumpCommandImpl.h @@ -92,11 +92,7 @@ public: /** * The move constructor */ - FSGTimedThumpCommandImpl(FSGTimedThumpCommandImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - ; + FSGTimedThumpCommandImpl(FSGTimedThumpCommandImpl&& Rhs) SG_NOEXCEPT; public: /** @@ -113,11 +109,7 @@ public: /** * The move assignment operator. */ - FSGTimedThumpCommandImpl& operator=(FSGTimedThumpCommandImpl&& Rhs) -#if SG_CPP17 - noexcept -#endif /* SG_CPP17 */ - ; + FSGTimedThumpCommandImpl& operator=(FSGTimedThumpCommandImpl&& Rhs) SG_NOEXCEPT; public: /**