From cfb08f096767aa82202abed5e968f58cf9818a8d Mon Sep 17 00:00:00 2001 From: Bastien JAUNY Date: Sun, 22 Oct 2023 11:13:06 +0200 Subject: [PATCH] Renamed NrtErrorHandling C API --- include/NovelRT.Interop/NrtErrorHandling.h | 46 +++++++------- src/NovelRT.Interop/Audio/NrtAudioService.cpp | 60 +++++++++---------- .../Ecs/Audio/NrtAudioSystem.cpp | 12 ++-- .../Graphics/NrtDefaultRenderingSystem.cpp | 8 +-- src/NovelRT.Interop/Ecs/NrtCatalogue.cpp | 10 ++-- .../Ecs/NrtComponentBufferMemoryContainer.cpp | 18 +++--- src/NovelRT.Interop/Ecs/NrtComponentCache.cpp | 12 ++-- src/NovelRT.Interop/Ecs/NrtConfigurator.cpp | 32 +++++----- src/NovelRT.Interop/Ecs/NrtEntityCache.cpp | 2 +- src/NovelRT.Interop/Ecs/NrtEntityIdVector.cpp | 6 +- .../Ecs/NrtSparseSetMemoryContainer.cpp | 58 +++++++++--------- .../Ecs/NrtSystemScheduler.cpp | 38 ++++++------ .../Ecs/NrtUnsafeComponentView.cpp | 26 ++++---- .../Graphics/NrtGraphicsProvider.cpp | 4 +- src/NovelRT.Interop/Input/NrtIInputDevice.cpp | 16 ++--- src/NovelRT.Interop/Input/NrtNovelKey.cpp | 4 +- src/NovelRT.Interop/Maths/NrtGeoBounds.cpp | 4 +- src/NovelRT.Interop/Maths/NrtQuadTree.cpp | 42 ++++++------- .../Maths/NrtQuadTreePoint.cpp | 4 +- .../NrtInteropErrorHandling.cpp | 48 +++++++-------- src/NovelRT.Interop/NrtLoggingService.cpp | 30 +++++----- .../NrtDefaultPluginSelector.cpp | 18 +++--- .../NrtIGraphicsPluginProvider.cpp | 8 +-- .../NrtIInputPluginProvider.cpp | 8 +-- .../NrtIResourceManagementPluginProvider.cpp | 8 +-- .../NrtIWindowingPluginProvider.cpp | 8 +-- .../NrtBinaryMemberMetadata.cpp | 2 +- .../ResourceManagement/NrtBinaryPackage.cpp | 2 +- .../ResourceManagement/NrtFilePathUuidMap.cpp | 6 +- .../ResourceManagement/NrtInt16Vector.cpp | 6 +- .../ResourceManagement/NrtResourceLoader.cpp | 40 ++++++------- .../ResourceManagement/NrtShaderMetadata.cpp | 2 +- .../ResourceManagement/NrtTextureMetadata.cpp | 2 +- .../ResourceManagement/NrtUint8Vector.cpp | 6 +- .../ResourceManagement/NrtUuidFilePathMap.cpp | 6 +- .../SceneGraph/NrtQuadTreeNode.cpp | 20 +++---- .../SceneGraph/NrtQuadTreeScenePoint.cpp | 8 +-- src/NovelRT.Interop/SceneGraph/NrtScene.cpp | 8 +-- .../SceneGraph/NrtSceneNode.cpp | 32 +++++----- .../NrtSceneNodeBreadthFirstIterator.cpp | 6 +- .../NrtSceneNodeDepthFirstIterator.cpp | 6 +- src/NovelRT.Interop/Timing/NrtStepTimer.cpp | 12 ++-- src/NovelRT.Interop/Utilities/NrtEvent.cpp | 10 ++-- src/NovelRT.Interop/Utilities/NrtMisc.cpp | 8 +-- .../Windowing/NrtIWindowingDevice.cpp | 8 +-- .../Interop/Maths/QuadTreePointTest.cpp | 4 +- 46 files changed, 362 insertions(+), 362 deletions(-) diff --git a/include/NovelRT.Interop/NrtErrorHandling.h b/include/NovelRT.Interop/NrtErrorHandling.h index dbb431a36..e4e0ec7d3 100644 --- a/include/NovelRT.Interop/NrtErrorHandling.h +++ b/include/NovelRT.Interop/NrtErrorHandling.h @@ -11,31 +11,31 @@ extern "C" { #endif - const char* Nrt_getLastError(); + const char* Nrt_GetLastError(); // Internal - const char* Nrt_getLastErrorInternal(); - void Nrt_setErrMsgIsNullInstanceProvidedInternal(); - void Nrt_setErrMsgIsNullArgumentProvidedInternal(); - void Nrt_setErrMsgIsNaNInternal(); - void Nrt_setErrMsgDupKeyGivenInternal(); - void Nrt_setErrMsgCompilationErrorInternal(); - void Nrt_setErrMsgIsFileNotFoundInternal(); - void Nrt_setErrMsgIsDivideByZeroInternal(); - void Nrt_setErrMsgIsAlreadyDeletedOrRemovedInternal(); - void Nrt_setErrMsgIsNotSupportedInternal(); - void Nrt_setErrMsgIsInitialisationFailureInternal(); - void Nrt_setErrMsgIsFunctionNotFoundInternal(); - void Nrt_setErrMsgIsNotInitialisedInternal(); - void Nrt_setErrMsgIsArgumentOutOfRangeInternal(); - void Nrt_setErrMsgIsInvalidOperationInternal(); - void Nrt_setErrMsgIsCharacterNotFoundInternal(); - void Nrt_setErrMsgIsOutOfMemoryInternal(); - void Nrt_setErrMsgKeyNotFoundInternal(); - void Nrt_setErrMsgRuntimeNotFoundInternal(); - void Nrt_setErrMsgErrorUnknownInternal(); - void Nrt_setErrMsgIsInvalidPathInternal(); - void Nrt_setErrMsgCustomInternal(const char* message); + const char* Nrt_GetLastErrorInternal(); + void Nrt_SetErrMsgIsNullInstanceProvidedInternal(); + void Nrt_SetErrMsgIsNullArgumentProvidedInternal(); + void Nrt_SetErrMsgIsNaNInternal(); + void Nrt_SetErrMsgDupKeyGivenInternal(); + void Nrt_SetErrMsgCompilationErrorInternal(); + void Nrt_SetErrMsgIsFileNotFoundInternal(); + void Nrt_SetErrMsgIsDivideByZeroInternal(); + void Nrt_SetErrMsgIsAlreadyDeletedOrRemovedInternal(); + void Nrt_SetErrMsgIsNotSupportedInternal(); + void Nrt_SetErrMsgIsInitialisationFailureInternal(); + void Nrt_SetErrMsgIsFunctionNotFoundInternal(); + void Nrt_SetErrMsgIsNotInitialisedInternal(); + void Nrt_SetErrMsgIsArgumentOutOfRangeInternal(); + void Nrt_SetErrMsgIsInvalidOperationInternal(); + void Nrt_SetErrMsgIsCharacterNotFoundInternal(); + void Nrt_SetErrMsgIsOutOfMemoryInternal(); + void Nrt_SetErrMsgKeyNotFoundInternal(); + void Nrt_SetErrMsgRuntimeNotFoundInternal(); + void Nrt_SetErrMsgErrorUnknownInternal(); + void Nrt_SetErrMsgIsInvalidPathInternal(); + void Nrt_SetErrMsgCustomInternal(const char* message); #ifdef __cplusplus } diff --git a/src/NovelRT.Interop/Audio/NrtAudioService.cpp b/src/NovelRT.Interop/Audio/NrtAudioService.cpp index 36cd7321a..e2ef70a4e 100644 --- a/src/NovelRT.Interop/Audio/NrtAudioService.cpp +++ b/src/NovelRT.Interop/Audio/NrtAudioService.cpp @@ -21,7 +21,7 @@ extern "C" { if (service == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } @@ -40,7 +40,7 @@ extern "C" } catch (const Exceptions::InitialisationFailureException&) { - Nrt_setErrMsgIsInitialisationFailureInternal(); + Nrt_SetErrMsgIsInitialisationFailureInternal(); return NRT_FAILURE_INITIALISATION_FAILURE; } } @@ -53,7 +53,7 @@ extern "C" { if (service == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } @@ -66,7 +66,7 @@ extern "C" } catch (const Exceptions::NotInitialisedException&) { - Nrt_setErrMsgIsNotInitialisedInternal(); + Nrt_SetErrMsgIsNotInitialisedInternal(); return NRT_FAILURE_NOT_INITIALISED; } @@ -78,7 +78,7 @@ extern "C" { if (service == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } @@ -90,7 +90,7 @@ extern "C" } catch (const Exceptions::NotInitialisedException&) { - Nrt_setErrMsgIsNotInitialisedInternal(); + Nrt_SetErrMsgIsNotInitialisedInternal(); return NRT_FAILURE_NOT_INITIALISED; } @@ -104,7 +104,7 @@ extern "C" { if (service == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } @@ -116,7 +116,7 @@ extern "C" } catch (const Exceptions::NotInitialisedException&) { - Nrt_setErrMsgIsNotInitialisedInternal(); + Nrt_SetErrMsgIsNotInitialisedInternal(); return NRT_FAILURE_NOT_INITIALISED; } @@ -127,7 +127,7 @@ extern "C" { if (service == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } @@ -139,7 +139,7 @@ extern "C" } catch (const Exceptions::NotInitialisedException&) { - Nrt_setErrMsgIsNotInitialisedInternal(); + Nrt_SetErrMsgIsNotInitialisedInternal(); return NRT_FAILURE_NOT_INITIALISED; } @@ -152,7 +152,7 @@ extern "C" { if (service == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } @@ -164,7 +164,7 @@ extern "C" } catch (const Exceptions::NotInitialisedException&) { - Nrt_setErrMsgIsNotInitialisedInternal(); + Nrt_SetErrMsgIsNotInitialisedInternal(); return NRT_FAILURE_NOT_INITIALISED; } @@ -175,7 +175,7 @@ extern "C" { if (service == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } @@ -187,7 +187,7 @@ extern "C" } catch (const Exceptions::NotInitialisedException&) { - Nrt_setErrMsgIsNotInitialisedInternal(); + Nrt_SetErrMsgIsNotInitialisedInternal(); return NRT_FAILURE_NOT_INITIALISED; } @@ -198,7 +198,7 @@ extern "C" { if (service == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } @@ -210,7 +210,7 @@ extern "C" } catch (const Exceptions::NotInitialisedException&) { - Nrt_setErrMsgIsNotInitialisedInternal(); + Nrt_SetErrMsgIsNotInitialisedInternal(); return NRT_FAILURE_NOT_INITIALISED; } @@ -221,7 +221,7 @@ extern "C" { if (service == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } @@ -233,7 +233,7 @@ extern "C" } catch (const Exceptions::NotInitialisedException&) { - Nrt_setErrMsgIsNotInitialisedInternal(); + Nrt_SetErrMsgIsNotInitialisedInternal(); return NRT_FAILURE_NOT_INITIALISED; } @@ -244,7 +244,7 @@ extern "C" { if (service == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } @@ -262,7 +262,7 @@ extern "C" { if (service == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } @@ -275,7 +275,7 @@ extern "C" } catch (const Exceptions::NotInitialisedException&) { - Nrt_setErrMsgIsNotInitialisedInternal(); + Nrt_SetErrMsgIsNotInitialisedInternal(); return NRT_FAILURE_NOT_INITIALISED; } @@ -286,7 +286,7 @@ extern "C" { if (service == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } @@ -299,7 +299,7 @@ extern "C" { if (service == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } @@ -311,7 +311,7 @@ extern "C" } catch (const Exceptions::NotInitialisedException&) { - Nrt_setErrMsgIsNotInitialisedInternal(); + Nrt_SetErrMsgIsNotInitialisedInternal(); return NRT_FAILURE_NOT_INITIALISED; } @@ -322,7 +322,7 @@ extern "C" { if (service == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } @@ -335,7 +335,7 @@ extern "C" { if (service == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } @@ -348,7 +348,7 @@ extern "C" { if (service == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } @@ -361,7 +361,7 @@ extern "C" { if (service == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } @@ -374,7 +374,7 @@ extern "C" { if (service == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } @@ -387,7 +387,7 @@ extern "C" { if (service == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } diff --git a/src/NovelRT.Interop/Ecs/Audio/NrtAudioSystem.cpp b/src/NovelRT.Interop/Ecs/Audio/NrtAudioSystem.cpp index 0f2ff1408..8d04e7873 100644 --- a/src/NovelRT.Interop/Ecs/Audio/NrtAudioSystem.cpp +++ b/src/NovelRT.Interop/Ecs/Audio/NrtAudioSystem.cpp @@ -23,7 +23,7 @@ extern "C" { if (system == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } @@ -36,7 +36,7 @@ extern "C" { if (system == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } @@ -54,7 +54,7 @@ extern "C" if (context == nullptr || catalogue == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } @@ -72,7 +72,7 @@ extern "C" { if (system == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } @@ -88,7 +88,7 @@ extern "C" { if (system == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } @@ -106,7 +106,7 @@ extern "C" { if (system == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } diff --git a/src/NovelRT.Interop/Ecs/Graphics/NrtDefaultRenderingSystem.cpp b/src/NovelRT.Interop/Ecs/Graphics/NrtDefaultRenderingSystem.cpp index ae1e7c7b0..4d1d0568e 100644 --- a/src/NovelRT.Interop/Ecs/Graphics/NrtDefaultRenderingSystem.cpp +++ b/src/NovelRT.Interop/Ecs/Graphics/NrtDefaultRenderingSystem.cpp @@ -14,13 +14,13 @@ NrtResult Nrt_DefaultRenderingSystem_FindInScheduler(NrtSystemSchedulerHandle sc { if (scheduler == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } if (outputResult == nullptr) { - Nrt_setErrMsgIsNullArgumentProvidedInternal(); + Nrt_SetErrMsgIsNullArgumentProvidedInternal(); return NRT_FAILURE_NULL_ARGUMENT_PROVIDED; } @@ -34,7 +34,7 @@ NrtResult Nrt_DefaultRenderingSystem_FindInScheduler(NrtSystemSchedulerHandle sc } catch (const NovelRT::Exceptions::KeyNotFoundException&) { - Nrt_setErrMsgKeyNotFoundInternal(); + Nrt_SetErrMsgKeyNotFoundInternal(); return NRT_FAILURE_KEY_NOT_FOUND; } } @@ -43,7 +43,7 @@ NrtResult Nrt_DefaultRenderingSystem_ForceVertexTextureFutureResolution(NrtDefau { if (system == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } diff --git a/src/NovelRT.Interop/Ecs/NrtCatalogue.cpp b/src/NovelRT.Interop/Ecs/NrtCatalogue.cpp index 345363c8a..d551c6f0c 100644 --- a/src/NovelRT.Interop/Ecs/NrtCatalogue.cpp +++ b/src/NovelRT.Interop/Ecs/NrtCatalogue.cpp @@ -24,13 +24,13 @@ extern "C" { if (catalogue == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } if (outputResult == nullptr) { - Nrt_setErrMsgIsNullArgumentProvidedInternal(); + Nrt_SetErrMsgIsNullArgumentProvidedInternal(); return NRT_FAILURE_NULL_ARGUMENT_PROVIDED; } @@ -44,7 +44,7 @@ extern "C" catch (const std::out_of_range&) { delete returnPtr; - Nrt_setErrMsgIsArgumentOutOfRangeInternal(); + Nrt_SetErrMsgIsArgumentOutOfRangeInternal(); return NRT_FAILURE_ARGUMENT_OUT_OF_RANGE; } @@ -70,7 +70,7 @@ extern "C" { if (catalogue == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } @@ -83,7 +83,7 @@ extern "C" { if (catalogue == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } diff --git a/src/NovelRT.Interop/Ecs/NrtComponentBufferMemoryContainer.cpp b/src/NovelRT.Interop/Ecs/NrtComponentBufferMemoryContainer.cpp index 02ee12831..3d15b897a 100644 --- a/src/NovelRT.Interop/Ecs/NrtComponentBufferMemoryContainer.cpp +++ b/src/NovelRT.Interop/Ecs/NrtComponentBufferMemoryContainer.cpp @@ -57,13 +57,13 @@ extern "C" { if (container == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } if (componentData == nullptr) { - Nrt_setErrMsgIsNullArgumentProvidedInternal(); + Nrt_SetErrMsgIsNullArgumentProvidedInternal(); return NRT_FAILURE_NULL_ARGUMENT_PROVIDED; } @@ -75,12 +75,12 @@ extern "C" } catch (const std::out_of_range&) { - Nrt_setErrMsgIsArgumentOutOfRangeInternal(); + Nrt_SetErrMsgIsArgumentOutOfRangeInternal(); return NRT_FAILURE_ARGUMENT_OUT_OF_RANGE; } catch (const DuplicateKeyException&) { - Nrt_setErrMsgDupKeyGivenInternal(); + Nrt_SetErrMsgDupKeyGivenInternal(); return NRT_FAILURE_DUPLICATE_KEY_PROVIDED; } } @@ -92,13 +92,13 @@ extern "C" { if (container == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } if (outputResult == nullptr) { - Nrt_setErrMsgIsNullArgumentProvidedInternal(); + Nrt_SetErrMsgIsNullArgumentProvidedInternal(); return NRT_FAILURE_NULL_ARGUMENT_PROVIDED; } @@ -112,7 +112,7 @@ extern "C" } catch (const KeyNotFoundException&) { - Nrt_setErrMsgKeyNotFoundInternal(); + Nrt_SetErrMsgKeyNotFoundInternal(); return NRT_FAILURE_KEY_NOT_FOUND; } } @@ -163,7 +163,7 @@ extern "C" { if (container == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } @@ -183,7 +183,7 @@ extern "C" { if (view == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } diff --git a/src/NovelRT.Interop/Ecs/NrtComponentCache.cpp b/src/NovelRT.Interop/Ecs/NrtComponentCache.cpp index 613f5f559..21dd9d026 100644 --- a/src/NovelRT.Interop/Ecs/NrtComponentCache.cpp +++ b/src/NovelRT.Interop/Ecs/NrtComponentCache.cpp @@ -25,14 +25,14 @@ extern "C" { if (componentCache == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } if (deleteInstructionState == nullptr || outputResult == nullptr || updateFnPtr == nullptr || comparatorFnPtr == nullptr || serialisedTypeName == nullptr) { - Nrt_setErrMsgIsNullArgumentProvidedInternal(); + Nrt_SetErrMsgIsNullArgumentProvidedInternal(); return NRT_FAILURE_NULL_ARGUMENT_PROVIDED; } @@ -54,7 +54,7 @@ extern "C" } catch (const std::bad_alloc&) { - Nrt_setErrMsgIsOutOfMemoryInternal(); + Nrt_SetErrMsgIsOutOfMemoryInternal(); return NRT_FAILURE_OUT_OF_MEMORY; } } @@ -65,13 +65,13 @@ extern "C" { if (componentCache == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } if (outputResult == nullptr) { - Nrt_setErrMsgIsNullArgumentProvidedInternal(); + Nrt_SetErrMsgIsNullArgumentProvidedInternal(); return NRT_FAILURE_NULL_ARGUMENT_PROVIDED; } @@ -92,7 +92,7 @@ extern "C" { if (componentCache == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } diff --git a/src/NovelRT.Interop/Ecs/NrtConfigurator.cpp b/src/NovelRT.Interop/Ecs/NrtConfigurator.cpp index 4acce3f8b..125965a1f 100644 --- a/src/NovelRT.Interop/Ecs/NrtConfigurator.cpp +++ b/src/NovelRT.Interop/Ecs/NrtConfigurator.cpp @@ -20,7 +20,7 @@ NrtResult Nrt_Configurator_AddDefaultSystemsAndComponents(NrtConfiguratorHandle { if (configurator == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } @@ -33,7 +33,7 @@ NrtResult Nrt_Configurator_Destroy(NrtConfiguratorHandle configurator) { if (configurator == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } @@ -47,13 +47,13 @@ NrtResult Nrt_Configurator_AddGraphicsPluginProvider(NrtConfiguratorHandle confi { if (configurator == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } if (provider == nullptr) { - Nrt_setErrMsgIsNullArgumentProvidedInternal(); + Nrt_SetErrMsgIsNullArgumentProvidedInternal(); return NRT_FAILURE_NULL_ARGUMENT_PROVIDED; } @@ -61,7 +61,7 @@ NrtResult Nrt_Configurator_AddGraphicsPluginProvider(NrtConfiguratorHandle confi auto providerSharedPtr = Lifetime::Find(pluginProvider); if (providerSharedPtr == nullptr) { - Nrt_setErrMsgIsAlreadyDeletedOrRemovedInternal(); + Nrt_SetErrMsgIsAlreadyDeletedOrRemovedInternal(); return NRT_FAILURE_ALREADY_DELETED_OR_REMOVED; } @@ -76,13 +76,13 @@ NrtResult Nrt_Configurator_AddWindowingPluginProvider(NrtConfiguratorHandle conf { if (configurator == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } if (provider == nullptr) { - Nrt_setErrMsgIsNullArgumentProvidedInternal(); + Nrt_SetErrMsgIsNullArgumentProvidedInternal(); return NRT_FAILURE_NULL_ARGUMENT_PROVIDED; } @@ -90,7 +90,7 @@ NrtResult Nrt_Configurator_AddWindowingPluginProvider(NrtConfiguratorHandle conf auto providerSharedPtr = Lifetime::Find(pluginProvider); if (providerSharedPtr == nullptr) { - Nrt_setErrMsgIsAlreadyDeletedOrRemovedInternal(); + Nrt_SetErrMsgIsAlreadyDeletedOrRemovedInternal(); return NRT_FAILURE_ALREADY_DELETED_OR_REMOVED; } @@ -105,13 +105,13 @@ NrtResult Nrt_Configurator_AddResourceManagementPluginProvider(NrtConfiguratorHa { if (configurator == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } if (provider == nullptr) { - Nrt_setErrMsgIsNullArgumentProvidedInternal(); + Nrt_SetErrMsgIsNullArgumentProvidedInternal(); return NRT_FAILURE_NULL_ARGUMENT_PROVIDED; } @@ -119,7 +119,7 @@ NrtResult Nrt_Configurator_AddResourceManagementPluginProvider(NrtConfiguratorHa auto providerSharedPtr = Lifetime::Find(pluginProvider); if (providerSharedPtr == nullptr) { - Nrt_setErrMsgIsAlreadyDeletedOrRemovedInternal(); + Nrt_SetErrMsgIsAlreadyDeletedOrRemovedInternal(); return NRT_FAILURE_ALREADY_DELETED_OR_REMOVED; } @@ -134,13 +134,13 @@ NrtResult Nrt_Configurator_AddInputPluginProvider(NrtConfiguratorHandle configur { if (configurator == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } if (provider == nullptr) { - Nrt_setErrMsgIsNullArgumentProvidedInternal(); + Nrt_SetErrMsgIsNullArgumentProvidedInternal(); return NRT_FAILURE_NULL_ARGUMENT_PROVIDED; } @@ -148,7 +148,7 @@ NrtResult Nrt_Configurator_AddInputPluginProvider(NrtConfiguratorHandle configur auto providerSharedPtr = Lifetime::Find(pluginProvider); if (providerSharedPtr == nullptr) { - Nrt_setErrMsgIsAlreadyDeletedOrRemovedInternal(); + Nrt_SetErrMsgIsAlreadyDeletedOrRemovedInternal(); return NRT_FAILURE_ALREADY_DELETED_OR_REMOVED; } @@ -162,13 +162,13 @@ NrtResult Nrt_Configurator_InitialiseAndRegisterComponents(NrtConfiguratorHandle { if (configurator == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } if (outputSystemScheduler == nullptr) { - Nrt_setErrMsgIsNullArgumentProvidedInternal(); + Nrt_SetErrMsgIsNullArgumentProvidedInternal(); return NRT_FAILURE_NULL_ARGUMENT_PROVIDED; } diff --git a/src/NovelRT.Interop/Ecs/NrtEntityCache.cpp b/src/NovelRT.Interop/Ecs/NrtEntityCache.cpp index 389a21a71..7575cb19f 100644 --- a/src/NovelRT.Interop/Ecs/NrtEntityCache.cpp +++ b/src/NovelRT.Interop/Ecs/NrtEntityCache.cpp @@ -34,7 +34,7 @@ extern "C" { if (entityCache == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } diff --git a/src/NovelRT.Interop/Ecs/NrtEntityIdVector.cpp b/src/NovelRT.Interop/Ecs/NrtEntityIdVector.cpp index 485c9a634..07d8c29af 100644 --- a/src/NovelRT.Interop/Ecs/NrtEntityIdVector.cpp +++ b/src/NovelRT.Interop/Ecs/NrtEntityIdVector.cpp @@ -21,7 +21,7 @@ extern "C" { if (vector == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } @@ -34,7 +34,7 @@ extern "C" { if (vector == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } @@ -55,7 +55,7 @@ extern "C" { if (vector == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } diff --git a/src/NovelRT.Interop/Ecs/NrtSparseSetMemoryContainer.cpp b/src/NovelRT.Interop/Ecs/NrtSparseSetMemoryContainer.cpp index b520d9012..6c69f72e5 100644 --- a/src/NovelRT.Interop/Ecs/NrtSparseSetMemoryContainer.cpp +++ b/src/NovelRT.Interop/Ecs/NrtSparseSetMemoryContainer.cpp @@ -24,13 +24,13 @@ extern "C" { if (container == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } if (value == nullptr) { - Nrt_setErrMsgIsNullArgumentProvidedInternal(); + Nrt_SetErrMsgIsNullArgumentProvidedInternal(); return NRT_FAILURE_NULL_ARGUMENT_PROVIDED; } @@ -42,17 +42,17 @@ extern "C" } catch (const DuplicateKeyException&) { - Nrt_setErrMsgDupKeyGivenInternal(); + Nrt_SetErrMsgDupKeyGivenInternal(); return NRT_FAILURE_DUPLICATE_KEY_PROVIDED; } catch (const std::bad_alloc&) { - Nrt_setErrMsgIsOutOfMemoryInternal(); + Nrt_SetErrMsgIsOutOfMemoryInternal(); return NRT_FAILURE_OUT_OF_MEMORY; } catch (const std::exception&) { - Nrt_setErrMsgErrorUnknownInternal(); + Nrt_SetErrMsgErrorUnknownInternal(); return NRT_FAILURE_UNKNOWN; } } @@ -68,7 +68,7 @@ extern "C" { if (container == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } @@ -79,7 +79,7 @@ extern "C" } catch (const KeyNotFoundException&) { - Nrt_setErrMsgKeyNotFoundInternal(); + Nrt_SetErrMsgKeyNotFoundInternal(); return NRT_FAILURE_KEY_NOT_FOUND; } } @@ -105,13 +105,13 @@ extern "C" { if (container == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } if (outputResult == nullptr) { - Nrt_setErrMsgIsNullArgumentProvidedInternal(); + Nrt_SetErrMsgIsNullArgumentProvidedInternal(); return NRT_FAILURE_NULL_ARGUMENT_PROVIDED; } @@ -123,7 +123,7 @@ extern "C" } catch (const std::out_of_range&) { - Nrt_setErrMsgIsArgumentOutOfRangeInternal(); + Nrt_SetErrMsgIsArgumentOutOfRangeInternal(); return NRT_FAILURE_ARGUMENT_OUT_OF_RANGE; } } @@ -141,13 +141,13 @@ extern "C" { if (container == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } if (outputResult == nullptr) { - Nrt_setErrMsgIsNullArgumentProvidedInternal(); + Nrt_SetErrMsgIsNullArgumentProvidedInternal(); return NRT_FAILURE_NULL_ARGUMENT_PROVIDED; } @@ -161,7 +161,7 @@ extern "C" } catch (const std::out_of_range&) { - Nrt_setErrMsgIsArgumentOutOfRangeInternal(); + Nrt_SetErrMsgIsArgumentOutOfRangeInternal(); return NRT_FAILURE_ARGUMENT_OUT_OF_RANGE; } } @@ -183,13 +183,13 @@ extern "C" { if (container == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } if (outputResult == nullptr) { - Nrt_setErrMsgIsNullArgumentProvidedInternal(); + Nrt_SetErrMsgIsNullArgumentProvidedInternal(); return NRT_FAILURE_NULL_ARGUMENT_PROVIDED; } @@ -203,7 +203,7 @@ extern "C" } catch (const std::out_of_range&) { - Nrt_setErrMsgIsArgumentOutOfRangeInternal(); + Nrt_SetErrMsgIsArgumentOutOfRangeInternal(); return NRT_FAILURE_ARGUMENT_OUT_OF_RANGE; } } @@ -292,7 +292,7 @@ extern "C" { if (container == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } @@ -331,7 +331,7 @@ extern "C" { if (view == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } @@ -365,7 +365,7 @@ extern "C" { if (view == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } @@ -404,13 +404,13 @@ extern "C" { if (iterator == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } if (outputId == nullptr || outputView == nullptr) { - Nrt_setErrMsgIsNullArgumentProvidedInternal(); + Nrt_SetErrMsgIsNullArgumentProvidedInternal(); return NRT_FAILURE_NULL_ARGUMENT_PROVIDED; } @@ -426,12 +426,12 @@ extern "C" } catch (const std::out_of_range&) { - Nrt_setErrMsgIsArgumentOutOfRangeInternal(); + Nrt_SetErrMsgIsArgumentOutOfRangeInternal(); return NRT_FAILURE_ARGUMENT_OUT_OF_RANGE; } catch (const std::exception&) // TODO: I'm not sure if this will throw anything else. Docs weren't clear. :( { - Nrt_setErrMsgErrorUnknownInternal(); + Nrt_SetErrMsgErrorUnknownInternal(); return NRT_FAILURE_UNKNOWN; } } @@ -440,7 +440,7 @@ extern "C" { if (iterator == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } @@ -479,13 +479,13 @@ extern "C" { if (iterator == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } if (outputId == nullptr || outputView == nullptr) { - Nrt_setErrMsgIsNullArgumentProvidedInternal(); + Nrt_SetErrMsgIsNullArgumentProvidedInternal(); return NRT_FAILURE_NULL_ARGUMENT_PROVIDED; } @@ -501,12 +501,12 @@ extern "C" } catch (const std::out_of_range&) { - Nrt_setErrMsgIsArgumentOutOfRangeInternal(); + Nrt_SetErrMsgIsArgumentOutOfRangeInternal(); return NRT_FAILURE_ARGUMENT_OUT_OF_RANGE; } catch (const std::exception&) // I'm not sure if this will throw anything else. Docs weren't clear. :( { - Nrt_setErrMsgErrorUnknownInternal(); + Nrt_SetErrMsgErrorUnknownInternal(); return NRT_FAILURE_UNKNOWN; } } @@ -515,7 +515,7 @@ NrtResult Nrt_SparseSetMemoryContainer_ConstIterator_Destroy(NrtSparseSetMemoryC { if (iterator == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } diff --git a/src/NovelRT.Interop/Ecs/NrtSystemScheduler.cpp b/src/NovelRT.Interop/Ecs/NrtSystemScheduler.cpp index 473acc118..8f7577bc7 100644 --- a/src/NovelRT.Interop/Ecs/NrtSystemScheduler.cpp +++ b/src/NovelRT.Interop/Ecs/NrtSystemScheduler.cpp @@ -68,7 +68,7 @@ extern "C" { if (systemScheduler == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } @@ -79,82 +79,82 @@ extern "C" } catch (const std::bad_alloc&) { - Nrt_setErrMsgIsOutOfMemoryInternal(); + Nrt_SetErrMsgIsOutOfMemoryInternal(); return NRT_FAILURE_OUT_OF_MEMORY; } catch (const std::out_of_range&) { - Nrt_setErrMsgIsArgumentOutOfRangeInternal(); + Nrt_SetErrMsgIsArgumentOutOfRangeInternal(); return NRT_FAILURE_ARGUMENT_OUT_OF_RANGE; } catch (const CharacterNotFoundException&) { - Nrt_setErrMsgIsCharacterNotFoundInternal(); + Nrt_SetErrMsgIsCharacterNotFoundInternal(); return NRT_FAILURE_CHARACTER_NOT_FOUND; } catch (const CompilationErrorException&) { - Nrt_setErrMsgCompilationErrorInternal(); + Nrt_SetErrMsgCompilationErrorInternal(); return NRT_FAILURE_COMPILATION_ERROR; } catch (const DuplicateKeyException&) { - Nrt_setErrMsgDupKeyGivenInternal(); + Nrt_SetErrMsgDupKeyGivenInternal(); return NRT_FAILURE_DUPLICATE_KEY_PROVIDED; } catch (const FileNotFoundException&) { - Nrt_setErrMsgIsFileNotFoundInternal(); + Nrt_SetErrMsgIsFileNotFoundInternal(); return NRT_FAILURE_FILE_NOT_FOUND; } catch (const FunctionNotFoundException&) { - Nrt_setErrMsgIsFunctionNotFoundInternal(); + Nrt_SetErrMsgIsFunctionNotFoundInternal(); return NRT_FAILURE_FUNCTION_NOT_FOUND; } catch (const InitialisationFailureException&) { - Nrt_setErrMsgIsInitialisationFailureInternal(); + Nrt_SetErrMsgIsInitialisationFailureInternal(); return NRT_FAILURE_INITIALISATION_FAILURE; } catch (const InvalidOperationException&) { - Nrt_setErrMsgIsInvalidOperationInternal(); + Nrt_SetErrMsgIsInvalidOperationInternal(); return NRT_FAILURE_INVALID_OPERATION; } catch (const KeyNotFoundException&) { - Nrt_setErrMsgKeyNotFoundInternal(); + Nrt_SetErrMsgKeyNotFoundInternal(); return NRT_FAILURE_KEY_NOT_FOUND; } catch (const NotInitialisedException&) { - Nrt_setErrMsgIsNotInitialisedInternal(); + Nrt_SetErrMsgIsNotInitialisedInternal(); return NRT_FAILURE_NOT_INITIALISED; } catch (const NotSupportedException&) { - Nrt_setErrMsgIsNotSupportedInternal(); + Nrt_SetErrMsgIsNotSupportedInternal(); return NRT_FAILURE_NOT_SUPPORTED; } catch (const NullPointerException&) { - Nrt_setErrMsgIsNullArgumentProvidedInternal(); + Nrt_SetErrMsgIsNullArgumentProvidedInternal(); return NRT_FAILURE_NULL_ARGUMENT_PROVIDED; } catch (const OutOfMemoryException&) { - Nrt_setErrMsgIsOutOfMemoryInternal(); + Nrt_SetErrMsgIsOutOfMemoryInternal(); return NRT_FAILURE_OUT_OF_MEMORY; } catch (const RuntimeNotFoundException&) { - Nrt_setErrMsgRuntimeNotFoundInternal(); + Nrt_SetErrMsgRuntimeNotFoundInternal(); return NRT_FAILURE_RUNTIME_NOT_FOUND; } catch (...) { - Nrt_setErrMsgErrorUnknownInternal(); + Nrt_SetErrMsgErrorUnknownInternal(); return NRT_FAILURE_UNKNOWN; } } @@ -163,7 +163,7 @@ extern "C" { if (systemScheduler == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } @@ -177,7 +177,7 @@ extern "C" { if (systemScheduler == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } diff --git a/src/NovelRT.Interop/Ecs/NrtUnsafeComponentView.cpp b/src/NovelRT.Interop/Ecs/NrtUnsafeComponentView.cpp index 77d88a5fe..d3b204ae8 100644 --- a/src/NovelRT.Interop/Ecs/NrtUnsafeComponentView.cpp +++ b/src/NovelRT.Interop/Ecs/NrtUnsafeComponentView.cpp @@ -27,13 +27,13 @@ extern "C" { if (componentView == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } if (instructionData == nullptr) { - Nrt_setErrMsgIsNullArgumentProvidedInternal(); + Nrt_SetErrMsgIsNullArgumentProvidedInternal(); return NRT_FAILURE_NULL_ARGUMENT_PROVIDED; } @@ -45,17 +45,17 @@ extern "C" } catch (const DuplicateKeyException&) { - Nrt_setErrMsgDupKeyGivenInternal(); + Nrt_SetErrMsgDupKeyGivenInternal(); return NRT_FAILURE_DUPLICATE_KEY_PROVIDED; } catch (const std::bad_alloc&) { - Nrt_setErrMsgIsOutOfMemoryInternal(); + Nrt_SetErrMsgIsOutOfMemoryInternal(); return NRT_FAILURE_OUT_OF_MEMORY; } catch (const std::out_of_range&) { - Nrt_setErrMsgIsArgumentOutOfRangeInternal(); + Nrt_SetErrMsgIsArgumentOutOfRangeInternal(); return NRT_FAILURE_ARGUMENT_OUT_OF_RANGE; } } @@ -64,7 +64,7 @@ extern "C" { if (componentView == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } @@ -75,17 +75,17 @@ extern "C" } catch (const DuplicateKeyException&) { - Nrt_setErrMsgDupKeyGivenInternal(); + Nrt_SetErrMsgDupKeyGivenInternal(); return NRT_FAILURE_DUPLICATE_KEY_PROVIDED; } catch (const std::bad_alloc&) { - Nrt_setErrMsgIsOutOfMemoryInternal(); + Nrt_SetErrMsgIsOutOfMemoryInternal(); return NRT_FAILURE_OUT_OF_MEMORY; } catch (const std::out_of_range&) { - Nrt_setErrMsgIsArgumentOutOfRangeInternal(); + Nrt_SetErrMsgIsArgumentOutOfRangeInternal(); return NRT_FAILURE_ARGUMENT_OUT_OF_RANGE; } } @@ -97,13 +97,13 @@ extern "C" { if (componentView == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } if (outputResult == nullptr) { - Nrt_setErrMsgIsNullArgumentProvidedInternal(); + Nrt_SetErrMsgIsNullArgumentProvidedInternal(); return NRT_FAILURE_NULL_ARGUMENT_PROVIDED; } @@ -117,7 +117,7 @@ extern "C" } catch (const KeyNotFoundException&) { - Nrt_setErrMsgKeyNotFoundInternal(); + Nrt_SetErrMsgKeyNotFoundInternal(); return NRT_FAILURE_KEY_NOT_FOUND; } } @@ -162,7 +162,7 @@ extern "C" { if (componentView == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } diff --git a/src/NovelRT.Interop/Graphics/NrtGraphicsProvider.cpp b/src/NovelRT.Interop/Graphics/NrtGraphicsProvider.cpp index 1ae8c7245..e963ba6fd 100644 --- a/src/NovelRT.Interop/Graphics/NrtGraphicsProvider.cpp +++ b/src/NovelRT.Interop/Graphics/NrtGraphicsProvider.cpp @@ -13,13 +13,13 @@ NrtResult Nrt_GraphicsProvider_Destroy(NrtGraphicsProviderHandle provider) { if (provider == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } if (!Lifetime::Release(reinterpret_cast(provider))) { - Nrt_setErrMsgIsAlreadyDeletedOrRemovedInternal(); + Nrt_SetErrMsgIsAlreadyDeletedOrRemovedInternal(); return NRT_FAILURE_ALREADY_DELETED_OR_REMOVED; } diff --git a/src/NovelRT.Interop/Input/NrtIInputDevice.cpp b/src/NovelRT.Interop/Input/NrtIInputDevice.cpp index 4d0c97d02..615ef2825 100644 --- a/src/NovelRT.Interop/Input/NrtIInputDevice.cpp +++ b/src/NovelRT.Interop/Input/NrtIInputDevice.cpp @@ -13,7 +13,7 @@ NrtResult Nrt_IInputDevice_Destroy(NrtIInputDeviceHandle device) { if (device == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } @@ -23,7 +23,7 @@ NrtResult Nrt_IInputDevice_Destroy(NrtIInputDeviceHandle device) } else { - Nrt_setErrMsgIsAlreadyDeletedOrRemovedInternal(); + Nrt_SetErrMsgIsAlreadyDeletedOrRemovedInternal(); return NRT_FAILURE_ALREADY_DELETED_OR_REMOVED; } } @@ -55,7 +55,7 @@ NrtResult Nrt_IInputDevice_AddInputAction(NrtIInputDeviceHandle device, { if (device == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } @@ -67,12 +67,12 @@ NrtResult Nrt_IInputDevice_AddInputAction(NrtIInputDeviceHandle device, } catch (const NovelRT::Exceptions::InvalidOperationException&) { - Nrt_setErrMsgIsInvalidOperationInternal(); + Nrt_SetErrMsgIsInvalidOperationInternal(); return NRT_FAILURE_INVALID_OPERATION; } catch (...) { - Nrt_setErrMsgErrorUnknownInternal(); + Nrt_SetErrMsgErrorUnknownInternal(); return NRT_FAILURE_UNKNOWN; } } @@ -83,7 +83,7 @@ NrtResult Nrt_IInputDevice_GetAvailableKey(NrtIInputDeviceHandle device, { if (device == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } @@ -95,12 +95,12 @@ NrtResult Nrt_IInputDevice_GetAvailableKey(NrtIInputDeviceHandle device, } catch (const NovelRT::Exceptions::InvalidOperationException&) { - Nrt_setErrMsgIsInvalidOperationInternal(); + Nrt_SetErrMsgIsInvalidOperationInternal(); return NRT_FAILURE_INVALID_OPERATION; } catch (...) { - Nrt_setErrMsgErrorUnknownInternal(); + Nrt_SetErrMsgErrorUnknownInternal(); return NRT_FAILURE_UNKNOWN; } } diff --git a/src/NovelRT.Interop/Input/NrtNovelKey.cpp b/src/NovelRT.Interop/Input/NrtNovelKey.cpp index 102880abb..69e05b427 100644 --- a/src/NovelRT.Interop/Input/NrtNovelKey.cpp +++ b/src/NovelRT.Interop/Input/NrtNovelKey.cpp @@ -33,7 +33,7 @@ NrtResult Nrt_NovelKey_PairKey(NrtNovelKeyHandle key, int32_t externalKeyCode) { if (key == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } @@ -47,7 +47,7 @@ NrtResult Nrt_NovelKey_UnpairKey(NrtNovelKeyHandle key) { if (key == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } diff --git a/src/NovelRT.Interop/Maths/NrtGeoBounds.cpp b/src/NovelRT.Interop/Maths/NrtGeoBounds.cpp index 89deeae6e..baed32f6f 100644 --- a/src/NovelRT.Interop/Maths/NrtGeoBounds.cpp +++ b/src/NovelRT.Interop/Maths/NrtGeoBounds.cpp @@ -55,7 +55,7 @@ extern "C" { if (outputResult == nullptr) { - Nrt_setErrMsgIsNullArgumentProvidedInternal(); + Nrt_SetErrMsgIsNullArgumentProvidedInternal(); return NRT_FAILURE_NULL_ARGUMENT_PROVIDED; } @@ -77,7 +77,7 @@ extern "C" } catch (const Exceptions::NotSupportedException) { - Nrt_setErrMsgIsNotSupportedInternal(); + Nrt_SetErrMsgIsNotSupportedInternal(); return NRT_FAILURE_NOT_SUPPORTED; } } diff --git a/src/NovelRT.Interop/Maths/NrtQuadTree.cpp b/src/NovelRT.Interop/Maths/NrtQuadTree.cpp index b0b5bf6a3..7f38e10d7 100644 --- a/src/NovelRT.Interop/Maths/NrtQuadTree.cpp +++ b/src/NovelRT.Interop/Maths/NrtQuadTree.cpp @@ -27,13 +27,13 @@ extern "C" { if (tree == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } if (outputParentTree == nullptr) { - Nrt_setErrMsgIsNullArgumentProvidedInternal(); + Nrt_SetErrMsgIsNullArgumentProvidedInternal(); return NRT_FAILURE_NULL_ARGUMENT_PROVIDED; } @@ -55,13 +55,13 @@ extern "C" { if (tree == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } if (outputPoint == nullptr) { - Nrt_setErrMsgIsNullArgumentProvidedInternal(); + Nrt_SetErrMsgIsNullArgumentProvidedInternal(); return NRT_FAILURE_NULL_ARGUMENT_PROVIDED; } @@ -81,13 +81,13 @@ extern "C" { if (tree == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } if (outputCornerTree == nullptr) { - Nrt_setErrMsgIsNullArgumentProvidedInternal(); + Nrt_SetErrMsgIsNullArgumentProvidedInternal(); return NRT_FAILURE_NULL_ARGUMENT_PROVIDED; } @@ -101,13 +101,13 @@ extern "C" { if (tree == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } if (outputCornerTree == nullptr) { - Nrt_setErrMsgIsNullArgumentProvidedInternal(); + Nrt_SetErrMsgIsNullArgumentProvidedInternal(); return NRT_FAILURE_NULL_ARGUMENT_PROVIDED; } @@ -121,13 +121,13 @@ extern "C" { if (tree == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } if (outputCornerTree == nullptr) { - Nrt_setErrMsgIsNullArgumentProvidedInternal(); + Nrt_SetErrMsgIsNullArgumentProvidedInternal(); return NRT_FAILURE_NULL_ARGUMENT_PROVIDED; } @@ -141,13 +141,13 @@ extern "C" { if (tree == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } if (outputCornerTree == nullptr) { - Nrt_setErrMsgIsNullArgumentProvidedInternal(); + Nrt_SetErrMsgIsNullArgumentProvidedInternal(); return NRT_FAILURE_NULL_ARGUMENT_PROVIDED; } @@ -177,13 +177,13 @@ extern "C" { if (tree == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } if (outputResultVector == nullptr) { - Nrt_setErrMsgIsNullArgumentProvidedInternal(); + Nrt_SetErrMsgIsNullArgumentProvidedInternal(); return NRT_FAILURE_NULL_ARGUMENT_PROVIDED; } @@ -197,7 +197,7 @@ extern "C" } catch (const Exceptions::NotSupportedException) { - Nrt_setErrMsgIsNotSupportedInternal(); + Nrt_SetErrMsgIsNotSupportedInternal(); return NRT_FAILURE_NOT_SUPPORTED; } @@ -210,7 +210,7 @@ extern "C" { if (vector == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } @@ -230,13 +230,13 @@ extern "C" { if (vector == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } if (outputPoint == nullptr) { - Nrt_setErrMsgIsNullArgumentProvidedInternal(); + Nrt_SetErrMsgIsNullArgumentProvidedInternal(); return NRT_FAILURE_NULL_ARGUMENT_PROVIDED; } @@ -247,7 +247,7 @@ extern "C" } catch (const std::out_of_range) { // todo: handle error message - Nrt_setErrMsgIsArgumentOutOfRangeInternal(); + Nrt_SetErrMsgIsArgumentOutOfRangeInternal(); return NRT_FAILURE_ARGUMENT_OUT_OF_RANGE; } @@ -258,7 +258,7 @@ extern "C" { if (tree == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } @@ -266,7 +266,7 @@ extern "C" if (std::find(_treeCollection.begin(), _treeCollection.end(), ptr) == _treeCollection.end()) { - Nrt_setErrMsgIsAlreadyDeletedOrRemovedInternal(); + Nrt_SetErrMsgIsAlreadyDeletedOrRemovedInternal(); return NRT_FAILURE_ALREADY_DELETED_OR_REMOVED; } diff --git a/src/NovelRT.Interop/Maths/NrtQuadTreePoint.cpp b/src/NovelRT.Interop/Maths/NrtQuadTreePoint.cpp index 62212a171..a01e81772 100644 --- a/src/NovelRT.Interop/Maths/NrtQuadTreePoint.cpp +++ b/src/NovelRT.Interop/Maths/NrtQuadTreePoint.cpp @@ -40,7 +40,7 @@ extern "C" { if (point == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } @@ -48,7 +48,7 @@ extern "C" if (std::find(_pointCollection.begin(), _pointCollection.end(), ptr) == _pointCollection.end()) { // TODO: This may prove to be a bottleneck later - Nrt_setErrMsgIsAlreadyDeletedOrRemovedInternal(); + Nrt_SetErrMsgIsAlreadyDeletedOrRemovedInternal(); return NRT_FAILURE_ALREADY_DELETED_OR_REMOVED; } diff --git a/src/NovelRT.Interop/NrtInteropErrorHandling.cpp b/src/NovelRT.Interop/NrtInteropErrorHandling.cpp index 251dccee5..ff84e0660 100644 --- a/src/NovelRT.Interop/NrtInteropErrorHandling.cpp +++ b/src/NovelRT.Interop/NrtInteropErrorHandling.cpp @@ -34,14 +34,14 @@ extern "C" { #endif - const char* Nrt_getLastError() + const char* Nrt_GetLastError() { - return Nrt_getLastErrorInternal(); + return Nrt_GetLastErrorInternal(); } // Internal - const char* Nrt_getLastErrorInternal() + const char* Nrt_GetLastErrorInternal() { if (currentErrorMessage == nullptr) { @@ -62,127 +62,127 @@ extern "C" customMessageSet = false; } - void Nrt_setErrMsgIsNullInstanceProvidedInternal() + void Nrt_SetErrMsgIsNullInstanceProvidedInternal() { validateCustomMessageInternal(); currentErrorMessage = errMsgIsNullInstanceProvided; } - void Nrt_setErrMsgKeyNotFoundInternal() + void Nrt_SetErrMsgKeyNotFoundInternal() { validateCustomMessageInternal(); currentErrorMessage = errMsgKeyNotFound; } - void Nrt_setErrMsgErrorUnknownInternal() + void Nrt_SetErrMsgErrorUnknownInternal() { validateCustomMessageInternal(); currentErrorMessage = errMsgErrorUnknown; } - void Nrt_setErrMsgIsFileNotFoundInternal() + void Nrt_SetErrMsgIsFileNotFoundInternal() { validateCustomMessageInternal(); currentErrorMessage = errMsgIsFileNotFound; } - void Nrt_setErrMsgDupKeyGivenInternal() + void Nrt_SetErrMsgDupKeyGivenInternal() { validateCustomMessageInternal(); currentErrorMessage = errMsgDupKeyGiven; } - void Nrt_setErrMsgCompilationErrorInternal() + void Nrt_SetErrMsgCompilationErrorInternal() { validateCustomMessageInternal(); currentErrorMessage = errMsgCompilationError; } - void Nrt_setErrMsgIsNullArgumentProvidedInternal() + void Nrt_SetErrMsgIsNullArgumentProvidedInternal() { validateCustomMessageInternal(); currentErrorMessage = errMsgIsNullArg; } - void Nrt_setErrMsgIsNaNInternal() + void Nrt_SetErrMsgIsNaNInternal() { validateCustomMessageInternal(); currentErrorMessage = errMsgIsNaN; } - void Nrt_setErrMsgIsDivideByZeroInternal() + void Nrt_SetErrMsgIsDivideByZeroInternal() { validateCustomMessageInternal(); currentErrorMessage = errMsgIsDivideByZero; } - void Nrt_setErrMsgIsAlreadyDeletedOrRemovedInternal() + void Nrt_SetErrMsgIsAlreadyDeletedOrRemovedInternal() { validateCustomMessageInternal(); currentErrorMessage = errMsgIsAlreadyDeletedOrRemoved; } - void Nrt_setErrMsgIsInitialisationFailureInternal() + void Nrt_SetErrMsgIsInitialisationFailureInternal() { validateCustomMessageInternal(); currentErrorMessage = errMsgIsInitialisationFailure; } - void Nrt_setErrMsgIsNotSupportedInternal() + void Nrt_SetErrMsgIsNotSupportedInternal() { validateCustomMessageInternal(); currentErrorMessage = errMsgIsNotSupportedInternal; } - void Nrt_setErrMsgRuntimeNotFoundInternal() + void Nrt_SetErrMsgRuntimeNotFoundInternal() { validateCustomMessageInternal(); currentErrorMessage = errMsgRuntimeNotFound; } - void Nrt_setErrMsgIsFunctionNotFoundInternal() + void Nrt_SetErrMsgIsFunctionNotFoundInternal() { validateCustomMessageInternal(); currentErrorMessage = errMsgIsFunctionNotFound; } - void Nrt_setErrMsgIsNotInitialisedInternal() + void Nrt_SetErrMsgIsNotInitialisedInternal() { validateCustomMessageInternal(); currentErrorMessage = errMsgIsNotInitialised; } - void Nrt_setErrMsgIsArgumentOutOfRangeInternal() + void Nrt_SetErrMsgIsArgumentOutOfRangeInternal() { validateCustomMessageInternal(); currentErrorMessage = errMsgIsArgumentOutOfRange; } - void Nrt_setErrMsgIsInvalidOperationInternal() + void Nrt_SetErrMsgIsInvalidOperationInternal() { validateCustomMessageInternal(); currentErrorMessage = errMsgIsInvalidOperation; } - void Nrt_setErrMsgIsCharacterNotFoundInternal() + void Nrt_SetErrMsgIsCharacterNotFoundInternal() { validateCustomMessageInternal(); currentErrorMessage = errMsgIsCharacterNotFound; } - void Nrt_setErrMsgIsOutOfMemoryInternal() + void Nrt_SetErrMsgIsOutOfMemoryInternal() { validateCustomMessageInternal(); currentErrorMessage = errMsgIsOutOfMemory; } - void Nrt_setErrMsgIsInvalidPathInternal() + void Nrt_SetErrMsgIsInvalidPathInternal() { validateCustomMessageInternal(); currentErrorMessage = errMsgInvalidPath; } - void Nrt_setErrMsgCustomInternal(const char* message) + void Nrt_SetErrMsgCustomInternal(const char* message) { currentErrorMessage = message; customMessageSet = true; diff --git a/src/NovelRT.Interop/NrtLoggingService.cpp b/src/NovelRT.Interop/NrtLoggingService.cpp index d201dea56..9449f6f54 100644 --- a/src/NovelRT.Interop/NrtLoggingService.cpp +++ b/src/NovelRT.Interop/NrtLoggingService.cpp @@ -32,7 +32,7 @@ extern "C" { if (service == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } @@ -46,7 +46,7 @@ extern "C" { if (service == nullptr) { - Nrt_setErrMsgIsNullArgumentProvidedInternal(); + Nrt_SetErrMsgIsNullArgumentProvidedInternal(); return NRT_FAILURE_NULL_ARGUMENT_PROVIDED; } @@ -60,13 +60,13 @@ extern "C" { if (service == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } if (message == nullptr) { - Nrt_setErrMsgIsNullArgumentProvidedInternal(); + Nrt_SetErrMsgIsNullArgumentProvidedInternal(); return NRT_FAILURE_NULL_ARGUMENT_PROVIDED; } @@ -80,13 +80,13 @@ extern "C" { if (service == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } if (message == nullptr) { - Nrt_setErrMsgIsNullArgumentProvidedInternal(); + Nrt_SetErrMsgIsNullArgumentProvidedInternal(); return NRT_FAILURE_NULL_ARGUMENT_PROVIDED; } @@ -100,13 +100,13 @@ extern "C" { if (service == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } if (message == nullptr) { - Nrt_setErrMsgIsNullArgumentProvidedInternal(); + Nrt_SetErrMsgIsNullArgumentProvidedInternal(); return NRT_FAILURE_NULL_ARGUMENT_PROVIDED; } @@ -120,13 +120,13 @@ extern "C" { if (service == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } if (message == nullptr) { - Nrt_setErrMsgIsNullArgumentProvidedInternal(); + Nrt_SetErrMsgIsNullArgumentProvidedInternal(); return NRT_FAILURE_NULL_ARGUMENT_PROVIDED; } @@ -140,7 +140,7 @@ extern "C" { if (service == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } @@ -156,13 +156,13 @@ extern "C" { if (service == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } if (exceptionMessage == nullptr) { - Nrt_setErrMsgIsNullArgumentProvidedInternal(); + Nrt_SetErrMsgIsNullArgumentProvidedInternal(); return NRT_FAILURE_NULL_ARGUMENT_PROVIDED; } @@ -177,13 +177,13 @@ extern "C" { if (service == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } if (exceptionMessage == nullptr) { - Nrt_setErrMsgIsNullArgumentProvidedInternal(); + Nrt_SetErrMsgIsNullArgumentProvidedInternal(); return NRT_FAILURE_NULL_ARGUMENT_PROVIDED; } diff --git a/src/NovelRT.Interop/PluginManagement/NrtDefaultPluginSelector.cpp b/src/NovelRT.Interop/PluginManagement/NrtDefaultPluginSelector.cpp index f7c7f5416..6d5216c2c 100644 --- a/src/NovelRT.Interop/PluginManagement/NrtDefaultPluginSelector.cpp +++ b/src/NovelRT.Interop/PluginManagement/NrtDefaultPluginSelector.cpp @@ -21,13 +21,13 @@ NrtResult Nrt_DefaultPluginSelector_GetDefaultResourceManagementPluginForCurrent { if (pluginSelector == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } if (outputResourceManagementPlugin == nullptr) { - Nrt_setErrMsgIsNullArgumentProvidedInternal(); + Nrt_SetErrMsgIsNullArgumentProvidedInternal(); return NRT_FAILURE_NULL_ARGUMENT_PROVIDED; } @@ -46,13 +46,13 @@ NrtResult Nrt_DefaultPluginSelector_GetDefaultGraphicsPluginForCurrentPlatform( { if (pluginSelector == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } if (outputGraphicsPlugin == nullptr) { - Nrt_setErrMsgIsNullArgumentProvidedInternal(); + Nrt_SetErrMsgIsNullArgumentProvidedInternal(); return NRT_FAILURE_NULL_ARGUMENT_PROVIDED; } @@ -71,13 +71,13 @@ NrtResult Nrt_DefaultPluginSelector_GetDefaultInputPluginForCurrentPlatform( { if (pluginSelector == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } if (outputInputPlugin == nullptr) { - Nrt_setErrMsgIsNullArgumentProvidedInternal(); + Nrt_SetErrMsgIsNullArgumentProvidedInternal(); return NRT_FAILURE_NULL_ARGUMENT_PROVIDED; } @@ -96,13 +96,13 @@ NrtResult Nrt_DefaultPluginSelector_GetDefaultWindowingPluginForCurrentPlatform( { if (pluginSelector == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } if (outputWindowingPlugin == nullptr) { - Nrt_setErrMsgIsNullArgumentProvidedInternal(); + Nrt_SetErrMsgIsNullArgumentProvidedInternal(); return NRT_FAILURE_NULL_ARGUMENT_PROVIDED; } @@ -119,7 +119,7 @@ NrtResult Nrt_DefaultPluginSelector_Destroy(NrtDefaultPluginSelectorHandle plugi { if (pluginSelector == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } diff --git a/src/NovelRT.Interop/PluginManagement/NrtIGraphicsPluginProvider.cpp b/src/NovelRT.Interop/PluginManagement/NrtIGraphicsPluginProvider.cpp index 1c730f511..20c90f577 100644 --- a/src/NovelRT.Interop/PluginManagement/NrtIGraphicsPluginProvider.cpp +++ b/src/NovelRT.Interop/PluginManagement/NrtIGraphicsPluginProvider.cpp @@ -13,13 +13,13 @@ NrtResult Nrt_IGraphicsPluginProvider_Destroy(NrtIGraphicsPluginProviderHandle p { if (plugin == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } if (!Lifetime::Release(reinterpret_cast(plugin))) { - Nrt_setErrMsgIsAlreadyDeletedOrRemovedInternal(); + Nrt_SetErrMsgIsAlreadyDeletedOrRemovedInternal(); return NRT_FAILURE_ALREADY_DELETED_OR_REMOVED; } @@ -31,13 +31,13 @@ NrtResult Nrt_IGraphicsPluginProvider_GetGraphicsProvider(NrtIGraphicsPluginProv { if (plugin == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } if (outputProvider == nullptr) { - Nrt_setErrMsgIsNullArgumentProvidedInternal(); + Nrt_SetErrMsgIsNullArgumentProvidedInternal(); return NRT_FAILURE_NULL_ARGUMENT_PROVIDED; } diff --git a/src/NovelRT.Interop/PluginManagement/NrtIInputPluginProvider.cpp b/src/NovelRT.Interop/PluginManagement/NrtIInputPluginProvider.cpp index ad7882f05..029a06fb9 100644 --- a/src/NovelRT.Interop/PluginManagement/NrtIInputPluginProvider.cpp +++ b/src/NovelRT.Interop/PluginManagement/NrtIInputPluginProvider.cpp @@ -13,13 +13,13 @@ NrtResult Nrt_IInputPluginProvider_Destroy(NrtIInputPluginProviderHandle plugin) { if (plugin == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } if (!Lifetime::Release(reinterpret_cast(plugin))) { - Nrt_setErrMsgIsAlreadyDeletedOrRemovedInternal(); + Nrt_SetErrMsgIsAlreadyDeletedOrRemovedInternal(); return NRT_FAILURE_ALREADY_DELETED_OR_REMOVED; } @@ -31,13 +31,13 @@ NrtResult Nrt_IInputPluginProvider_GetInputDevice(NrtIInputPluginProviderHandle { if (plugin == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } if (outputDevice == nullptr) { - Nrt_setErrMsgIsNullArgumentProvidedInternal(); + Nrt_SetErrMsgIsNullArgumentProvidedInternal(); return NRT_FAILURE_NULL_ARGUMENT_PROVIDED; } diff --git a/src/NovelRT.Interop/PluginManagement/NrtIResourceManagementPluginProvider.cpp b/src/NovelRT.Interop/PluginManagement/NrtIResourceManagementPluginProvider.cpp index 392927bcb..d96a33b05 100644 --- a/src/NovelRT.Interop/PluginManagement/NrtIResourceManagementPluginProvider.cpp +++ b/src/NovelRT.Interop/PluginManagement/NrtIResourceManagementPluginProvider.cpp @@ -13,13 +13,13 @@ NrtResult Nrt_IResourceManagementPluginProvider_Destroy(NrtIResourceManagementPl { if (plugin == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } if (!Lifetime::Release(reinterpret_cast(plugin))) { - Nrt_setErrMsgIsAlreadyDeletedOrRemovedInternal(); + Nrt_SetErrMsgIsAlreadyDeletedOrRemovedInternal(); return NRT_FAILURE_ALREADY_DELETED_OR_REMOVED; } @@ -32,13 +32,13 @@ NrtResult Nrt_IResourceManagementPluginProvider_GetResourceLoader(NrtIResourceMa { if (plugin == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } if (outputLoader == nullptr) { - Nrt_setErrMsgIsNullArgumentProvidedInternal(); + Nrt_SetErrMsgIsNullArgumentProvidedInternal(); return NRT_FAILURE_NULL_ARGUMENT_PROVIDED; } diff --git a/src/NovelRT.Interop/PluginManagement/NrtIWindowingPluginProvider.cpp b/src/NovelRT.Interop/PluginManagement/NrtIWindowingPluginProvider.cpp index d4e569e97..fb1448f66 100644 --- a/src/NovelRT.Interop/PluginManagement/NrtIWindowingPluginProvider.cpp +++ b/src/NovelRT.Interop/PluginManagement/NrtIWindowingPluginProvider.cpp @@ -13,13 +13,13 @@ NrtResult Nrt_IWindowingPluginProvider_Destroy(NrtIWindowingPluginProviderHandle { if (plugin == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } if (!Lifetime::Release(reinterpret_cast(plugin))) { - Nrt_setErrMsgIsAlreadyDeletedOrRemovedInternal(); + Nrt_SetErrMsgIsAlreadyDeletedOrRemovedInternal(); return NRT_FAILURE_ALREADY_DELETED_OR_REMOVED; } @@ -31,13 +31,13 @@ NrtResult Nrt_IWindowingPluginProvider_GetWindowingDevice(NrtIWindowingPluginPro { if (plugin == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } if (outputDevice == nullptr) { - Nrt_setErrMsgIsNullArgumentProvidedInternal(); + Nrt_SetErrMsgIsNullArgumentProvidedInternal(); return NRT_FAILURE_NULL_ARGUMENT_PROVIDED; } diff --git a/src/NovelRT.Interop/ResourceManagement/NrtBinaryMemberMetadata.cpp b/src/NovelRT.Interop/ResourceManagement/NrtBinaryMemberMetadata.cpp index e9544ac9a..d2552f5fd 100644 --- a/src/NovelRT.Interop/ResourceManagement/NrtBinaryMemberMetadata.cpp +++ b/src/NovelRT.Interop/ResourceManagement/NrtBinaryMemberMetadata.cpp @@ -20,7 +20,7 @@ extern "C" { if (memberMetadata == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } diff --git a/src/NovelRT.Interop/ResourceManagement/NrtBinaryPackage.cpp b/src/NovelRT.Interop/ResourceManagement/NrtBinaryPackage.cpp index 80d3a80e9..addf3b726 100644 --- a/src/NovelRT.Interop/ResourceManagement/NrtBinaryPackage.cpp +++ b/src/NovelRT.Interop/ResourceManagement/NrtBinaryPackage.cpp @@ -13,7 +13,7 @@ extern "C" { if (package == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } diff --git a/src/NovelRT.Interop/ResourceManagement/NrtFilePathUuidMap.cpp b/src/NovelRT.Interop/ResourceManagement/NrtFilePathUuidMap.cpp index f80115489..999adc190 100644 --- a/src/NovelRT.Interop/ResourceManagement/NrtFilePathUuidMap.cpp +++ b/src/NovelRT.Interop/ResourceManagement/NrtFilePathUuidMap.cpp @@ -13,13 +13,13 @@ extern "C" { if (map == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } if (filePath == nullptr || outUuid == nullptr) { - Nrt_setErrMsgIsNullArgumentProvidedInternal(); + Nrt_SetErrMsgIsNullArgumentProvidedInternal(); return NRT_FAILURE_NULL_ARGUMENT_PROVIDED; } @@ -31,7 +31,7 @@ extern "C" } catch (const std::out_of_range&) { - Nrt_setErrMsgIsArgumentOutOfRangeInternal(); + Nrt_SetErrMsgIsArgumentOutOfRangeInternal(); return NRT_FAILURE_ARGUMENT_OUT_OF_RANGE; } diff --git a/src/NovelRT.Interop/ResourceManagement/NrtInt16Vector.cpp b/src/NovelRT.Interop/ResourceManagement/NrtInt16Vector.cpp index 43a8ff40f..dd24877ba 100644 --- a/src/NovelRT.Interop/ResourceManagement/NrtInt16Vector.cpp +++ b/src/NovelRT.Interop/ResourceManagement/NrtInt16Vector.cpp @@ -18,7 +18,7 @@ extern "C" { if (vector == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } @@ -31,7 +31,7 @@ extern "C" { if (vector == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } @@ -44,7 +44,7 @@ extern "C" { if (vector == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } diff --git a/src/NovelRT.Interop/ResourceManagement/NrtResourceLoader.cpp b/src/NovelRT.Interop/ResourceManagement/NrtResourceLoader.cpp index b669f9e40..8d967775e 100644 --- a/src/NovelRT.Interop/ResourceManagement/NrtResourceLoader.cpp +++ b/src/NovelRT.Interop/ResourceManagement/NrtResourceLoader.cpp @@ -30,13 +30,13 @@ extern "C" { if (resourceLoader == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } if (newDirectory == nullptr) { - Nrt_setErrMsgIsNullArgumentProvidedInternal(); + Nrt_SetErrMsgIsNullArgumentProvidedInternal(); return NRT_FAILURE_NULL_ARGUMENT_PROVIDED; } @@ -49,14 +49,14 @@ extern "C" } catch (const std::runtime_error&) { - Nrt_setErrMsgIsInvalidPathInternal(); + Nrt_SetErrMsgIsInvalidPathInternal(); return NRT_FAILURE_INVALID_DIRECTORY_PATH; } // TODO: not sure if we want an additional error code for this. if (cppPath.is_relative()) { - Nrt_setErrMsgIsInvalidPathInternal(); + Nrt_SetErrMsgIsInvalidPathInternal(); return NRT_FAILURE_INVALID_DIRECTORY_PATH; } @@ -74,7 +74,7 @@ extern "C" { if (resourceLoader == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } @@ -84,7 +84,7 @@ extern "C" } catch (const NovelRT::Exceptions::IOException&) { - Nrt_setErrMsgIsFileNotFoundInternal(); + Nrt_SetErrMsgIsFileNotFoundInternal(); return NRT_FAILURE_FILE_NOT_FOUND; } @@ -109,13 +109,13 @@ extern "C" { if (resourceLoader == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } if (outTextureMetadata == nullptr || filePath == nullptr) { - Nrt_setErrMsgIsNullArgumentProvidedInternal(); + Nrt_SetErrMsgIsNullArgumentProvidedInternal(); return NRT_FAILURE_NULL_ARGUMENT_PROVIDED; } @@ -128,7 +128,7 @@ extern "C" } catch (const std::runtime_error&) { - Nrt_setErrMsgIsInvalidPathInternal(); + Nrt_SetErrMsgIsInvalidPathInternal(); return NRT_FAILURE_INVALID_DIRECTORY_PATH; } @@ -138,7 +138,7 @@ extern "C" } catch (const FileNotFoundException&) { - Nrt_setErrMsgIsFileNotFoundInternal(); + Nrt_SetErrMsgIsFileNotFoundInternal(); return NRT_FAILURE_FILE_NOT_FOUND; } @@ -153,13 +153,13 @@ extern "C" { if (resourceLoader == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } if (outShaderMetadata == nullptr || filePath == nullptr) { - Nrt_setErrMsgIsNullArgumentProvidedInternal(); + Nrt_SetErrMsgIsNullArgumentProvidedInternal(); return NRT_FAILURE_NULL_ARGUMENT_PROVIDED; } @@ -172,7 +172,7 @@ extern "C" } catch (const std::runtime_error&) { - Nrt_setErrMsgIsInvalidPathInternal(); + Nrt_SetErrMsgIsInvalidPathInternal(); return NRT_FAILURE_INVALID_DIRECTORY_PATH; } @@ -182,7 +182,7 @@ extern "C" } catch (const FileNotFoundException&) { - Nrt_setErrMsgIsFileNotFoundInternal(); + Nrt_SetErrMsgIsFileNotFoundInternal(); return NRT_FAILURE_FILE_NOT_FOUND; } @@ -197,13 +197,13 @@ extern "C" { if (resourceLoader == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } if (outBinaryPackage == nullptr || filePath == nullptr) { - Nrt_setErrMsgIsNullArgumentProvidedInternal(); + Nrt_SetErrMsgIsNullArgumentProvidedInternal(); return NRT_FAILURE_NULL_ARGUMENT_PROVIDED; } @@ -216,7 +216,7 @@ extern "C" } catch (const std::runtime_error&) { - Nrt_setErrMsgIsInvalidPathInternal(); + Nrt_SetErrMsgIsInvalidPathInternal(); return NRT_FAILURE_INVALID_DIRECTORY_PATH; } @@ -226,7 +226,7 @@ extern "C" } catch (const FileNotFoundException&) { - Nrt_setErrMsgIsFileNotFoundInternal(); + Nrt_SetErrMsgIsFileNotFoundInternal(); return NRT_FAILURE_FILE_NOT_FOUND; } @@ -240,7 +240,7 @@ NrtResult Nrt_ResourceLoader_Destroy(NrtResourceLoaderHandle resourceLoader) { if (resourceLoader == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } @@ -250,7 +250,7 @@ NrtResult Nrt_ResourceLoader_Destroy(NrtResourceLoaderHandle resourceLoader) } else { - Nrt_setErrMsgIsAlreadyDeletedOrRemovedInternal(); + Nrt_SetErrMsgIsAlreadyDeletedOrRemovedInternal(); return NRT_FAILURE_ALREADY_DELETED_OR_REMOVED; } } diff --git a/src/NovelRT.Interop/ResourceManagement/NrtShaderMetadata.cpp b/src/NovelRT.Interop/ResourceManagement/NrtShaderMetadata.cpp index 119107948..21e0dfaf0 100644 --- a/src/NovelRT.Interop/ResourceManagement/NrtShaderMetadata.cpp +++ b/src/NovelRT.Interop/ResourceManagement/NrtShaderMetadata.cpp @@ -14,7 +14,7 @@ extern "C" { if (shaderMetadata == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } diff --git a/src/NovelRT.Interop/ResourceManagement/NrtTextureMetadata.cpp b/src/NovelRT.Interop/ResourceManagement/NrtTextureMetadata.cpp index 397fec5e5..153f49c92 100644 --- a/src/NovelRT.Interop/ResourceManagement/NrtTextureMetadata.cpp +++ b/src/NovelRT.Interop/ResourceManagement/NrtTextureMetadata.cpp @@ -13,7 +13,7 @@ extern "C" { if (textureMetadata == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } diff --git a/src/NovelRT.Interop/ResourceManagement/NrtUint8Vector.cpp b/src/NovelRT.Interop/ResourceManagement/NrtUint8Vector.cpp index 5dabf80fe..1c6195738 100644 --- a/src/NovelRT.Interop/ResourceManagement/NrtUint8Vector.cpp +++ b/src/NovelRT.Interop/ResourceManagement/NrtUint8Vector.cpp @@ -18,7 +18,7 @@ extern "C" { if (vector == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } @@ -31,7 +31,7 @@ extern "C" { if (vector == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } @@ -44,7 +44,7 @@ extern "C" { if (vector == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } diff --git a/src/NovelRT.Interop/ResourceManagement/NrtUuidFilePathMap.cpp b/src/NovelRT.Interop/ResourceManagement/NrtUuidFilePathMap.cpp index a81e6e3ff..7d60e6fe7 100644 --- a/src/NovelRT.Interop/ResourceManagement/NrtUuidFilePathMap.cpp +++ b/src/NovelRT.Interop/ResourceManagement/NrtUuidFilePathMap.cpp @@ -13,13 +13,13 @@ extern "C" { if (map == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } if (outFilePath == nullptr) { - Nrt_setErrMsgIsNullArgumentProvidedInternal(); + Nrt_SetErrMsgIsNullArgumentProvidedInternal(); return NRT_FAILURE_NULL_ARGUMENT_PROVIDED; } @@ -38,7 +38,7 @@ extern "C" } catch (const std::out_of_range&) { - Nrt_setErrMsgIsArgumentOutOfRangeInternal(); + Nrt_SetErrMsgIsArgumentOutOfRangeInternal(); return NRT_FAILURE_ARGUMENT_OUT_OF_RANGE; } diff --git a/src/NovelRT.Interop/SceneGraph/NrtQuadTreeNode.cpp b/src/NovelRT.Interop/SceneGraph/NrtQuadTreeNode.cpp index 4ff5d05f6..ce2fe32fc 100644 --- a/src/NovelRT.Interop/SceneGraph/NrtQuadTreeNode.cpp +++ b/src/NovelRT.Interop/SceneGraph/NrtQuadTreeNode.cpp @@ -15,7 +15,7 @@ extern "C" { if (points == nullptr || outputNode == nullptr) { - Nrt_setErrMsgIsNullArgumentProvidedInternal(); + Nrt_SetErrMsgIsNullArgumentProvidedInternal(); return NRT_FAILURE_NULL_ARGUMENT_PROVIDED; } @@ -30,13 +30,13 @@ extern "C" { if (node == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } if (outputPoint == nullptr) { - Nrt_setErrMsgIsNullArgumentProvidedInternal(); + Nrt_SetErrMsgIsNullArgumentProvidedInternal(); return NRT_FAILURE_NULL_ARGUMENT_PROVIDED; } @@ -51,13 +51,13 @@ extern "C" { if (node == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } if (outputPoint == nullptr) { - Nrt_setErrMsgIsNullArgumentProvidedInternal(); + Nrt_SetErrMsgIsNullArgumentProvidedInternal(); return NRT_FAILURE_NULL_ARGUMENT_PROVIDED; } @@ -72,13 +72,13 @@ extern "C" { if (node == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } if (outputPoint == nullptr) { - Nrt_setErrMsgIsNullArgumentProvidedInternal(); + Nrt_SetErrMsgIsNullArgumentProvidedInternal(); return NRT_FAILURE_NULL_ARGUMENT_PROVIDED; } @@ -93,13 +93,13 @@ extern "C" { if (node == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } if (outputPoint == nullptr) { - Nrt_setErrMsgIsNullArgumentProvidedInternal(); + Nrt_SetErrMsgIsNullArgumentProvidedInternal(); return NRT_FAILURE_NULL_ARGUMENT_PROVIDED; } @@ -119,7 +119,7 @@ extern "C" if (pointOne == nullptr || pointTwo == nullptr || pointThree == nullptr || pointFour == nullptr || outputArray == nullptr) { - Nrt_setErrMsgIsNullArgumentProvidedInternal(); + Nrt_SetErrMsgIsNullArgumentProvidedInternal(); return NRT_FAILURE_NULL_ARGUMENT_PROVIDED; } diff --git a/src/NovelRT.Interop/SceneGraph/NrtQuadTreeScenePoint.cpp b/src/NovelRT.Interop/SceneGraph/NrtQuadTreeScenePoint.cpp index e501216c4..2a5174518 100644 --- a/src/NovelRT.Interop/SceneGraph/NrtQuadTreeScenePoint.cpp +++ b/src/NovelRT.Interop/SceneGraph/NrtQuadTreeScenePoint.cpp @@ -19,7 +19,7 @@ extern "C" { if (node == nullptr || outputPoint == nullptr) { - Nrt_setErrMsgIsNullArgumentProvidedInternal(); + Nrt_SetErrMsgIsNullArgumentProvidedInternal(); return NRT_FAILURE_NULL_ARGUMENT_PROVIDED; } @@ -38,7 +38,7 @@ extern "C" { if (node == nullptr || outputPoint == nullptr) { - Nrt_setErrMsgIsNullArgumentProvidedInternal(); + Nrt_SetErrMsgIsNullArgumentProvidedInternal(); return NRT_FAILURE_NULL_ARGUMENT_PROVIDED; } @@ -53,13 +53,13 @@ extern "C" { if (point == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } if (outputNode == nullptr) { - Nrt_setErrMsgIsNullArgumentProvidedInternal(); + Nrt_SetErrMsgIsNullArgumentProvidedInternal(); return NRT_FAILURE_NULL_ARGUMENT_PROVIDED; } diff --git a/src/NovelRT.Interop/SceneGraph/NrtScene.cpp b/src/NovelRT.Interop/SceneGraph/NrtScene.cpp index 9795bd7cc..b560592dc 100644 --- a/src/NovelRT.Interop/SceneGraph/NrtScene.cpp +++ b/src/NovelRT.Interop/SceneGraph/NrtScene.cpp @@ -21,13 +21,13 @@ extern "C" { if (scene == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } if (outputSet == nullptr) { - Nrt_setErrMsgIsNullArgumentProvidedInternal(); + Nrt_SetErrMsgIsNullArgumentProvidedInternal(); return NRT_FAILURE_NULL_ARGUMENT_PROVIDED; } @@ -58,7 +58,7 @@ extern "C" { if (scene == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } @@ -75,7 +75,7 @@ extern "C" // strcpy should be "safe" there since we called strlen earlier strcpy(target, message); - Nrt_setErrMsgCustomInternal(target); + Nrt_SetErrMsgCustomInternal(target); return NRT_FAILURE_UNKNOWN; } diff --git a/src/NovelRT.Interop/SceneGraph/NrtSceneNode.cpp b/src/NovelRT.Interop/SceneGraph/NrtSceneNode.cpp index 40c3fc3f7..aa780f167 100644 --- a/src/NovelRT.Interop/SceneGraph/NrtSceneNode.cpp +++ b/src/NovelRT.Interop/SceneGraph/NrtSceneNode.cpp @@ -41,13 +41,13 @@ extern "C" { if (node == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } if (outputSet == nullptr) { - Nrt_setErrMsgIsNullArgumentProvidedInternal(); + Nrt_SetErrMsgIsNullArgumentProvidedInternal(); return NRT_FAILURE_NULL_ARGUMENT_PROVIDED; } @@ -62,13 +62,13 @@ extern "C" { if (node == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } if (outputSet == nullptr) { - Nrt_setErrMsgIsNullArgumentProvidedInternal(); + Nrt_SetErrMsgIsNullArgumentProvidedInternal(); return NRT_FAILURE_NULL_ARGUMENT_PROVIDED; } @@ -106,13 +106,13 @@ extern "C" { if (node == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } if (action == nullptr) { - Nrt_setErrMsgIsNullArgumentProvidedInternal(); + Nrt_SetErrMsgIsNullArgumentProvidedInternal(); return NRT_FAILURE_NULL_ARGUMENT_PROVIDED; } @@ -129,7 +129,7 @@ extern "C" { if (node == nullptr || action == nullptr || outputIterator == nullptr) { - Nrt_setErrMsgIsNullArgumentProvidedInternal(); + Nrt_SetErrMsgIsNullArgumentProvidedInternal(); return NRT_FAILURE_NULL_ARGUMENT_PROVIDED; } @@ -149,13 +149,13 @@ extern "C" { if (node == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } if (action == nullptr) { - Nrt_setErrMsgIsNullArgumentProvidedInternal(); + Nrt_SetErrMsgIsNullArgumentProvidedInternal(); return NRT_FAILURE_NULL_ARGUMENT_PROVIDED; } @@ -173,13 +173,13 @@ extern "C" { if (node == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } if (action == nullptr || outputIterator == nullptr) { - Nrt_setErrMsgIsNullArgumentProvidedInternal(); + Nrt_SetErrMsgIsNullArgumentProvidedInternal(); return NRT_FAILURE_NULL_ARGUMENT_PROVIDED; } @@ -204,7 +204,7 @@ extern "C" { if (node == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } @@ -212,7 +212,7 @@ extern "C" if (std::find(_sceneNodeCollection.begin(), _sceneNodeCollection.end(), nodePointer) == _sceneNodeCollection.end()) { - Nrt_setErrMsgIsAlreadyDeletedOrRemovedInternal(); + Nrt_SetErrMsgIsAlreadyDeletedOrRemovedInternal(); return NRT_FAILURE_ALREADY_DELETED_OR_REMOVED; } @@ -224,7 +224,7 @@ extern "C" { if (nodeSet == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } @@ -243,13 +243,13 @@ extern "C" { if (nodeSet == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } if (outputSceneNode == nullptr) { - Nrt_setErrMsgIsNullArgumentProvidedInternal(); + Nrt_SetErrMsgIsNullArgumentProvidedInternal(); return NRT_FAILURE_NULL_ARGUMENT_PROVIDED; } diff --git a/src/NovelRT.Interop/SceneGraph/NrtSceneNodeBreadthFirstIterator.cpp b/src/NovelRT.Interop/SceneGraph/NrtSceneNodeBreadthFirstIterator.cpp index d9727bbe3..92d9bb106 100644 --- a/src/NovelRT.Interop/SceneGraph/NrtSceneNodeBreadthFirstIterator.cpp +++ b/src/NovelRT.Interop/SceneGraph/NrtSceneNodeBreadthFirstIterator.cpp @@ -28,7 +28,7 @@ extern "C" { if (node == nullptr || action == nullptr) { - Nrt_setErrMsgIsNullArgumentProvidedInternal(); + Nrt_SetErrMsgIsNullArgumentProvidedInternal(); return NRT_FAILURE_NULL_ARGUMENT_PROVIDED; } @@ -45,7 +45,7 @@ extern "C" { if (iterator == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } @@ -59,7 +59,7 @@ extern "C" { if (iterator == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } diff --git a/src/NovelRT.Interop/SceneGraph/NrtSceneNodeDepthFirstIterator.cpp b/src/NovelRT.Interop/SceneGraph/NrtSceneNodeDepthFirstIterator.cpp index 1bde41c0e..76c5e1464 100644 --- a/src/NovelRT.Interop/SceneGraph/NrtSceneNodeDepthFirstIterator.cpp +++ b/src/NovelRT.Interop/SceneGraph/NrtSceneNodeDepthFirstIterator.cpp @@ -28,7 +28,7 @@ extern "C" { if (node == nullptr || action == nullptr) { - Nrt_setErrMsgIsNullArgumentProvidedInternal(); + Nrt_SetErrMsgIsNullArgumentProvidedInternal(); return NRT_FAILURE_NULL_ARGUMENT_PROVIDED; } @@ -46,7 +46,7 @@ extern "C" { if (iterator == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } @@ -60,7 +60,7 @@ extern "C" { if (iterator == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } diff --git a/src/NovelRT.Interop/Timing/NrtStepTimer.cpp b/src/NovelRT.Interop/Timing/NrtStepTimer.cpp index 094ce2cc3..6e514bad2 100644 --- a/src/NovelRT.Interop/Timing/NrtStepTimer.cpp +++ b/src/NovelRT.Interop/Timing/NrtStepTimer.cpp @@ -10,7 +10,7 @@ NrtResult Nrt_StepTimer_create(uint32_t targetFrameRate, double maxSecondDelta, { if (output == nullptr) { - Nrt_setErrMsgIsNullArgumentProvidedInternal(); + Nrt_SetErrMsgIsNullArgumentProvidedInternal(); return NRT_FAILURE_NULL_ARGUMENT_PROVIDED; } @@ -53,7 +53,7 @@ NrtResult Nrt_StepTimer_setTargetElapsedTicks(NrtStepTimerHandle timer, uint64_t { if (timer == nullptr) { - Nrt_setErrMsgIsNullArgumentProvidedInternal(); + Nrt_SetErrMsgIsNullArgumentProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } @@ -72,7 +72,7 @@ NrtResult Nrt_StepTimer_setTargetElapsedTime(NrtStepTimerHandle timer, NrtTimest { if (timer == nullptr) { - Nrt_setErrMsgIsNullArgumentProvidedInternal(); + Nrt_SetErrMsgIsNullArgumentProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } @@ -103,7 +103,7 @@ NrtResult Nrt_StepTimer_setIsFixedTimeStep(NrtStepTimerHandle timer, int32_t inp { if (timer == nullptr) { - Nrt_setErrMsgIsNullArgumentProvidedInternal(); + Nrt_SetErrMsgIsNullArgumentProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } @@ -116,7 +116,7 @@ NrtResult Nrt_StepTimer_resetElapsedTime(NrtStepTimerHandle timer) { if (timer == nullptr) { - Nrt_setErrMsgIsNullArgumentProvidedInternal(); + Nrt_SetErrMsgIsNullArgumentProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } @@ -129,7 +129,7 @@ NrtResult Nrt_StepTimer_tick(NrtStepTimerHandle timer, NrtUtilitiesEventWithTime { if (event == nullptr) { - Nrt_setErrMsgIsNullArgumentProvidedInternal(); + Nrt_SetErrMsgIsNullArgumentProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } diff --git a/src/NovelRT.Interop/Utilities/NrtEvent.cpp b/src/NovelRT.Interop/Utilities/NrtEvent.cpp index 90e5d7a74..3c94bd2df 100644 --- a/src/NovelRT.Interop/Utilities/NrtEvent.cpp +++ b/src/NovelRT.Interop/Utilities/NrtEvent.cpp @@ -140,13 +140,13 @@ NrtResult GenericEvent_AddEventHandler(typename Details::NrtHandle event, { if (event == nullptr) { - Nrt_setErrMsgIsNullArgumentProvidedInternal(); + Nrt_SetErrMsgIsNullArgumentProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } if (handler == nullptr) { - Nrt_setErrMsgIsNullArgumentProvidedInternal(); + Nrt_SetErrMsgIsNullArgumentProvidedInternal(); return NRT_FAILURE_NULL_ARGUMENT_PROVIDED; } @@ -166,7 +166,7 @@ NrtResult GenericEvent_RemoveEventHandler(typename Details::NrtHandle event, Nrt { if (event == nullptr) { - Nrt_setErrMsgIsNullArgumentProvidedInternal(); + Nrt_SetErrMsgIsNullArgumentProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } @@ -180,7 +180,7 @@ NrtResult GenericEvent_Invoke(typename Details::NrtHandle event, Args&&... args) { if (event == nullptr) { - Nrt_setErrMsgIsNullArgumentProvidedInternal(); + Nrt_SetErrMsgIsNullArgumentProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } @@ -194,7 +194,7 @@ NrtResult GenericEvent_Destroy(typename Details::NrtHandle event) { if (event == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } diff --git a/src/NovelRT.Interop/Utilities/NrtMisc.cpp b/src/NovelRT.Interop/Utilities/NrtMisc.cpp index ffeadb8d3..0645903b9 100644 --- a/src/NovelRT.Interop/Utilities/NrtMisc.cpp +++ b/src/NovelRT.Interop/Utilities/NrtMisc.cpp @@ -37,7 +37,7 @@ extern "C" { if (numberOfArgs <= 1) { - Nrt_setErrMsgCustomInternal("Cannot append file path when nothing is being appended!"); + Nrt_SetErrMsgCustomInternal("Cannot append file path when nothing is being appended!"); return NULL; } @@ -63,7 +63,7 @@ extern "C" if (finalPath == nullptr) { - Nrt_setErrMsgIsOutOfMemoryInternal(); + Nrt_SetErrMsgIsOutOfMemoryInternal(); return NULL; } @@ -76,7 +76,7 @@ extern "C" { if (numberOfArgs <= 1) { - Nrt_setErrMsgCustomInternal("Cannot append text when nothing is being appended!"); + Nrt_SetErrMsgCustomInternal("Cannot append text when nothing is being appended!"); return NULL; } @@ -90,7 +90,7 @@ extern "C" char* finalText = new char[finalString.length() + 1]; if (strlen(finalText) < (finalString.length() + 1)) { - Nrt_setErrMsgCustomInternal("Could not properly allocate memory for text!"); + Nrt_SetErrMsgCustomInternal("Could not properly allocate memory for text!"); return NULL; } diff --git a/src/NovelRT.Interop/Windowing/NrtIWindowingDevice.cpp b/src/NovelRT.Interop/Windowing/NrtIWindowingDevice.cpp index a993df25e..6dc895940 100644 --- a/src/NovelRT.Interop/Windowing/NrtIWindowingDevice.cpp +++ b/src/NovelRT.Interop/Windowing/NrtIWindowingDevice.cpp @@ -13,7 +13,7 @@ NrtResult Nrt_IWindowingDevice_Destroy(NrtIWindowingDeviceHandle device) { if (device == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } @@ -23,7 +23,7 @@ NrtResult Nrt_IWindowingDevice_Destroy(NrtIWindowingDeviceHandle device) } else { - Nrt_setErrMsgIsAlreadyDeletedOrRemovedInternal(); + Nrt_SetErrMsgIsAlreadyDeletedOrRemovedInternal(); return NRT_FAILURE_ALREADY_DELETED_OR_REMOVED; } } @@ -53,7 +53,7 @@ NrtResult Nrt_IWindowingDevice_SetWindowTitle(NrtIWindowingDeviceHandle device, { if (device == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } @@ -66,7 +66,7 @@ NrtResult Nrt_IWindowingDevice_ProcessAllMessages(NrtIWindowingDeviceHandle devi { if (device == nullptr) { - Nrt_setErrMsgIsNullInstanceProvidedInternal(); + Nrt_SetErrMsgIsNullInstanceProvidedInternal(); return NRT_FAILURE_NULL_INSTANCE_PROVIDED; } diff --git a/tests/NovelRT.Tests/Interop/Maths/QuadTreePointTest.cpp b/tests/NovelRT.Tests/Interop/Maths/QuadTreePointTest.cpp index bab725eab..b2f1ba55e 100644 --- a/tests/NovelRT.Tests/Interop/Maths/QuadTreePointTest.cpp +++ b/tests/NovelRT.Tests/Interop/Maths/QuadTreePointTest.cpp @@ -31,7 +31,7 @@ TEST(InteropQuadTreePointTest, DeleteReturnsNullInstanceFailureWhenGivenNullptr) { const char* outputError = "Unable to continue. A null instance was provided when an instance was expected."; ASSERT_EQ(Nrt_QuadTreePoint_Destroy(nullptr), NRT_FAILURE_NULL_INSTANCE_PROVIDED); - EXPECT_STREQ(outputError, Nrt_getLastError()); + EXPECT_STREQ(outputError, Nrt_GetLastError()); } TEST(InteropQuadTreePointTest, @@ -44,5 +44,5 @@ TEST(InteropQuadTreePointTest, ASSERT_EQ(Nrt_QuadTreePoint_Destroy(reinterpret_cast(ptr.get())), NRT_FAILURE_ALREADY_DELETED_OR_REMOVED); - EXPECT_STREQ(outputError, Nrt_getLastError()); + EXPECT_STREQ(outputError, Nrt_GetLastError()); }