Changeset 1315 for cpp/frams/param/param.h

Timestamp:

07/11/24 17:26:06 (10 months ago)

Author:

Maciej Komosinski

Message:

Offset of fields within an object: replaced subtraction of pointers/addresses with the official offsetof()

File:

• cpp/frams/param/param.h (modified) (5 diffs)

cpp/frams/param/param.h ¶

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2022  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2024  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -216 +216 @@
 // implementations:
 
-extern char MakeCodeGuardHappy;
-
 #define PROCOFFSET(_proc_) ( (void (*)(void*,ExtValue*,ExtValue*)) &(FIELDSTRUCT :: _proc_ ## _statrick))
 #define STATICPROCOFFSET(_proc_) ( (void (*)(void*,ExtValue*,ExtValue*)) &(FIELDSTRUCT :: _proc_))
@@ -223 +221 @@
 #define SETOFFSET(_proc_) ( (int (*)(void*,const ExtValue*)) &(FIELDSTRUCT :: _proc_ ## _statrick))
 
-#define FIELDOFFSET(_fld_) ((intptr_t)((char*)(&((FIELDSTRUCT*)&MakeCodeGuardHappy)->_fld_)-((char*)((FIELDSTRUCT*)&MakeCodeGuardHappy))))
+#define FIELDOFFSET(_fld_) ((intptr_t)offsetof(FIELDSTRUCT, _fld_)) // https://stackoverflow.com/questions/177885/looking-for-something-similar-to-offsetof-for-non-pod-types , https://stackoverflow.com/questions/713963/why-does-this-implementation-of-offsetof-work
 
 #ifdef _DEBUG
@@ -349 +347 @@
 
 #ifdef CHECK_PARAMENTRY_COUNT
-        
+
         template <int COUNT>
-        Param(ParamEntry (&t)[COUNT],void* o = 0, const char*n = 0) :SimpleAbstractParam(o, n), tab(t)
+        Param(ParamEntry(&t)[COUNT], void* o = 0, const char*n = 0) :SimpleAbstractParam(o, n), tab(t)
         {
-                if (!n&&tab) myname = tab[0].name;
+                if (!n && tab) myname = tab[0].name;
                 //printf("Param(ParamEntry t[%d]) %s\n",COUNT,myname?myname:"unknown name");
                 if (tab)
-                        {
-                        int in_array = COUNT-1-tab[0].group;
+                {
+                        int in_array = COUNT - 1 - tab[0].group;
                         if (tab[0].flags != in_array)
-                                printf("\nCHECK_PARAMENTRY_COUNT: %d items in ParamEntry[] array, declared %d (%s)\n\n",in_array, tab[0].flags, myname?myname:"unknown name");
-                        if (in_array>0 && tab[COUNT-1].id != NULL) //in_array>0 -> completely empty paramtab can't end with the usual zero row because that's also its first row
-                                printf("\nCHECK_PARAMENTRY_COUNT: last entry is not null (%s)\n\n",myname?myname:"unknown name");
-                        }
+                                printf("\nCHECK_PARAMENTRY_COUNT: %d items in ParamEntry[] array, declared %d (%s)\n\n", in_array, tab[0].flags, myname ? myname : "unknown name");
+                        if (in_array > 0 && tab[COUNT - 1].id != NULL) //in_array>0 -> completely empty paramtab can't end with the usual zero row because that's also its first row
+                                printf("\nCHECK_PARAMENTRY_COUNT: last entry is not null (%s)\n\n", myname ? myname : "unknown name");
+                }
         }
 
-        template<typename T, typename std::enable_if_t<std::is_same<ParamEntry*,T>::value>* = nullptr > //SFINAE-fu because the normal ParamEntry* overload would be also called for ParamEntry[COUNT] argument
+        template<typename T, typename std::enable_if_t<std::is_same<ParamEntry*, T>::value>* = nullptr > //SFINAE-fu because the normal ParamEntry* overload would be also called for ParamEntry[COUNT] argument
         Param(T t, void* o = 0, const char*n = 0) :SimpleAbstractParam(o, n), tab(t)
         {
                 //printf("Param(ParamEntry* t) %s\n",tab?tab[0].name:"");
-                if (!n&&tab) myname = tab[0].name;
+                if (!n && tab) myname = tab[0].name;
         }
 
@@ -378 +376 @@
 
 #else // CHECK_PARAMENTRY_COUNT
-        
-        Param(ParamEntry *t = 0, void* o = 0, const char*n = 0) :SimpleAbstractParam(o, n), tab(t)
+
+        Param(ParamEntry *t = 0, void* o = 0, const char*n = 0) : SimpleAbstractParam(o, n), tab(t)
         {
-                if (!n&&tab) myname = tab[0].name;
+                if (!n && tab) myname = tab[0].name;
         }
-        
+
 #endif // CHECK_PARAMENTRY_COUNT
-        
+
         Param(const Param& p) :SimpleAbstractParam(p.object, p.myname), tab(p.tab) {}
         void operator=(const Param&p) { object = p.object; myname = p.myname; tab = p.tab; }