diff --git a/Include_MultiHeaders/Macros.hpp b/Include_MultiHeaders/Macros.hpp index 669f553..2f95e43 100644 --- a/Include_MultiHeaders/Macros.hpp +++ b/Include_MultiHeaders/Macros.hpp @@ -140,7 +140,7 @@ namespace CppOverride INTERNAL_CO_OVERRIDE_IMPL_NO_RETURN_TYPE_PART_2(overrideObjName, this, args) \ INTERNAL_CO_OVERRIDE_IMPL_COMMON_PART_3(overrideObjName, void, this, args) - #define CO_OVERRIDE_IMPL_INSTNACE(overrideObjName, returnType, args) \ + #define CO_OVERRIDE_IMPL_INSTANCE(overrideObjName, returnType, args) \ INTERNAL_CO_OVERRIDE_IMPL_COMMON_PART_1(overrideObjName, returnType, this, args) \ INTERNAL_CO_OVERRIDE_IMPL_NORMAL_PART_2(overrideObjName, returnType, this, args) \ INTERNAL_CO_OVERRIDE_IMPL_COMMON_PART_3(overrideObjName, returnType, this, args) diff --git a/Include_SingleHeader/CppOverride.hpp b/Include_SingleHeader/CppOverride.hpp index 18bd669..d3464f3 100644 --- a/Include_SingleHeader/CppOverride.hpp +++ b/Include_SingleHeader/CppOverride.hpp @@ -5405,7 +5405,7 @@ namespace CppOverride INTERNAL_CO_OVERRIDE_IMPL_NO_RETURN_TYPE_PART_2(overrideObjName, this, args) \ INTERNAL_CO_OVERRIDE_IMPL_COMMON_PART_3(overrideObjName, void, this, args) - #define CO_OVERRIDE_IMPL_INSTNACE(overrideObjName, returnType, args) \ + #define CO_OVERRIDE_IMPL_INSTANCE(overrideObjName, returnType, args) \ INTERNAL_CO_OVERRIDE_IMPL_COMMON_PART_1(overrideObjName, returnType, this, args) \ INTERNAL_CO_OVERRIDE_IMPL_NORMAL_PART_2(overrideObjName, returnType, this, args) \ INTERNAL_CO_OVERRIDE_IMPL_COMMON_PART_3(overrideObjName, returnType, this, args) diff --git a/Scripts/GenerateMockClass.cpp b/Scripts/GenerateMockClass.cpp index 336506a..be226ea 100644 --- a/Scripts/GenerateMockClass.cpp +++ b/Scripts/GenerateMockClass.cpp @@ -1434,7 +1434,7 @@ void GenerateMockClass( const std::vector& classesDetails, else { if(globalInstance) - std::cout << " CO_OVERRIDE_IMPL_INSTNACE(OverrideInstanceName, "; + std::cout << " CO_OVERRIDE_IMPL_INSTANCE(OverrideInstanceName, "; else std::cout << " CO_OVERRIDE_IMPL(OverrideInstanceName, "; diff --git a/Tests/Components/GlobalInstanceMockShapes.hpp b/Tests/Components/GlobalInstanceMockShapes.hpp index c51f811..dee5b57 100644 --- a/Tests/Components/GlobalInstanceMockShapes.hpp +++ b/Tests/Components/GlobalInstanceMockShapes.hpp @@ -14,13 +14,13 @@ class MockShape public: virtual inline float GetArea(float arg0 = 1.f) const { - CO_OVERRIDE_IMPL_INSTNACE(OverrideObj, float, (arg0)); + CO_OVERRIDE_IMPL_INSTANCE(OverrideObj, float, (arg0)); return float(); } virtual inline float GetPerimeter(float arg0 = 1.f) const { - CO_OVERRIDE_IMPL_INSTNACE(OverrideObj, float, (arg0)); + CO_OVERRIDE_IMPL_INSTANCE(OverrideObj, float, (arg0)); return float(); } @@ -32,25 +32,25 @@ class MockSquare : public Shape public: template < typename T2 > inline std::tuple < float , T2 > TestTemplateFunc(const std::tuple < float , T2 > & arg0, float arg1 = 1.f) { - CO_OVERRIDE_IMPL_INSTNACE(OverrideObj, (std::tuple < float , T2 >), (arg0, arg1)); + CO_OVERRIDE_IMPL_INSTANCE(OverrideObj, (std::tuple < float , T2 >), (arg0, arg1)); return std::tuple < float , T2 >(); } inline void TestComplexTypes(std::tuple < int , char > arg0, float arg1 = 1.f) { - CO_OVERRIDE_IMPL_INSTNACE(OverrideObj, void, (arg0, arg1)); + CO_OVERRIDE_IMPL_INSTANCE(OverrideObj, void, (arg0, arg1)); return void(); } inline bool operator==(const Square < T > & arg0) const { - CO_OVERRIDE_IMPL_INSTNACE(OverrideObj, bool, (arg0)); + CO_OVERRIDE_IMPL_INSTANCE(OverrideObj, bool, (arg0)); return bool(); } inline bool operator!=(const Square < T > & arg0) const { - CO_OVERRIDE_IMPL_INSTNACE(OverrideObj, bool, (arg0)); + CO_OVERRIDE_IMPL_INSTANCE(OverrideObj, bool, (arg0)); return bool(); } @@ -66,67 +66,67 @@ class MockSquare : public Shape inline virtual float GetArea(float arg0 = 1.f) const override { - CO_OVERRIDE_IMPL_INSTNACE(OverrideObj, float, (arg0)); + CO_OVERRIDE_IMPL_INSTANCE(OverrideObj, float, (arg0)); return float(); } inline virtual float GetPerimeter(float arg0 = 1.f) const override { - CO_OVERRIDE_IMPL_INSTNACE(OverrideObj, float, (arg0)); + CO_OVERRIDE_IMPL_INSTANCE(OverrideObj, float, (arg0)); return float(); } inline virtual void SetWidth(float arg0) { - CO_OVERRIDE_IMPL_INSTNACE(OverrideObj, void, (arg0)); + CO_OVERRIDE_IMPL_INSTANCE(OverrideObj, void, (arg0)); return void(); } inline virtual void SetWidth(int arg0) { - CO_OVERRIDE_IMPL_INSTNACE(OverrideObj, void, (arg0)); + CO_OVERRIDE_IMPL_INSTANCE(OverrideObj, void, (arg0)); return void(); } inline virtual float GetWidth(float arg0 = 1.f) const { - CO_OVERRIDE_IMPL_INSTNACE(OverrideObj, float, (arg0)); + CO_OVERRIDE_IMPL_INSTANCE(OverrideObj, float, (arg0)); return float(); } inline virtual void GetWidth(float& arg0, float arg1 = 1.f) { - CO_OVERRIDE_IMPL_INSTNACE(OverrideObj, void, (arg0, arg1)); + CO_OVERRIDE_IMPL_INSTANCE(OverrideObj, void, (arg0, arg1)); return void(); } inline virtual void GetWidth(float* arg0, float arg1 = 1.f) const { - CO_OVERRIDE_IMPL_INSTNACE(OverrideObj, void, (arg0, arg1)); + CO_OVERRIDE_IMPL_INSTANCE(OverrideObj, void, (arg0, arg1)); return void(); } inline virtual void SetMetaData(T arg0) { - CO_OVERRIDE_IMPL_INSTNACE(OverrideObj, void, (arg0)); + CO_OVERRIDE_IMPL_INSTANCE(OverrideObj, void, (arg0)); return void(); } inline virtual T GetMetaData() const { - CO_OVERRIDE_IMPL_INSTNACE(OverrideObj, T, ()); + CO_OVERRIDE_IMPL_INSTANCE(OverrideObj, T, ()); return T(); } inline virtual void GetMetaData(T& arg0) const { - CO_OVERRIDE_IMPL_INSTNACE(OverrideObj, void, (arg0)); + CO_OVERRIDE_IMPL_INSTANCE(OverrideObj, void, (arg0)); return void(); } inline virtual void GetMetaData(T* arg0) const { - CO_OVERRIDE_IMPL_INSTNACE(OverrideObj, void, (arg0)); + CO_OVERRIDE_IMPL_INSTANCE(OverrideObj, void, (arg0)); return void(); }