From 0e367485f950b2ab7b9bd1b6c5e4a9b5d328a5dc Mon Sep 17 00:00:00 2001 From: Markus Mittendrein Date: Thu, 23 Apr 2020 22:43:55 +0200 Subject: Store MemoryManagement by value instead of pointer --- src/cppc4group.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/cppc4group.cpp') diff --git a/src/cppc4group.cpp b/src/cppc4group.cpp index 09a27e1..2c69b98 100644 --- a/src/cppc4group.cpp +++ b/src/cppc4group.cpp @@ -43,7 +43,7 @@ struct CppC4Group::Private { struct CppC4Group::MemoryManagement::Private { struct CustomMemoryManagement { - CC4Group_MemoryManagement_t realMemoryManagement; + CC4Group_MemoryManagement realMemoryManagement; Start start; End end; @@ -148,9 +148,9 @@ CppC4Group::MemoryManagement::MemoryManagementStrategy CppC4Group::MemoryManagem return p->strategy; } -const CppC4Group::MemoryManagement CppC4Group::MemoryManagement::Take{reinterpret_cast(cc4group.MemoryManagement.Take)}; -const CppC4Group::MemoryManagement CppC4Group::MemoryManagement::Copy{reinterpret_cast(cc4group.MemoryManagement.Copy)}; -const CppC4Group::MemoryManagement CppC4Group::MemoryManagement::Reference{reinterpret_cast(cc4group.MemoryManagement.Reference)}; +const CppC4Group::MemoryManagement CppC4Group::MemoryManagement::Take{reinterpret_cast(&cc4group.MemoryManagement.Take)}; +const CppC4Group::MemoryManagement CppC4Group::MemoryManagement::Copy{reinterpret_cast(&cc4group.MemoryManagement.Copy)}; +const CppC4Group::MemoryManagement CppC4Group::MemoryManagement::Reference{reinterpret_cast(&cc4group.MemoryManagement.Reference)}; namespace { int convertAllowedEntryTypes(const CppC4Group::AllowedEntryTypes allowedEntryTypes) @@ -184,7 +184,7 @@ namespace { CC4Group_MemoryManagement convertMemoryManagement(const CppC4Group::MemoryManagement& memoryManagement) { - return reinterpret_cast(memoryManagement()); + return *reinterpret_cast(memoryManagement()); } } -- cgit v1.2.3-54-g00ecf