work on c++ -std=c++98 compat WIP

rurban · Feb 21, 2024 · 0ecc5b3 · 0ecc5b3
1 parent d314c08
commit 0ecc5b3
Show file tree

Hide file tree

Showing 3 changed files with 128 additions and 45 deletions.
diff --git a/tests/func/digi.hh b/tests/func/digi.hh
@@ -74,23 +74,40 @@ digi_hash(digi* a)
     return (size_t)int_hash_func(*a->value);
 }
 
+#if __cplusplus <= 199711
+# define nullptr NULL
+#endif
+
 struct DIGI
 {
     int* value;
+#if __cplusplus > 199711
     DIGI(int _value): value { new int {_value} }
     {
     }
     DIGI(): DIGI(0)
     {
     }
-    ~DIGI()
+    DIGI(const DIGI& a): DIGI()
     {
-        delete value;
+        *value = a.value ? *a.value : 0;
     }
-    DIGI(const DIGI& a): DIGI()
+#else
+    DIGI(int _value)
     {
+        value = new int;
+        *value = _value;
+    }
+    DIGI(const DIGI& a)
+    {
+        value = new int;
         *value = a.value ? *a.value : 0;
     }
+#endif
+    ~DIGI()
+    {
+        delete value;
+    }
     DIGI& operator=(const DIGI& a)
     {
         delete value;
@@ -111,6 +128,11 @@ struct DIGI
         value = a.value;
         a.value = nullptr;
     }
+#else
+    DIGI(DIGI& a)
+    {
+        *value = a.value ? *a.value : 0;
+    }
 #endif
     bool operator<(const DIGI& a) const
     {
@@ -216,4 +238,10 @@ DIGI_bintrans (const DIGI& d1, const DIGI& d2)
     return DIGI{*d1.value ^ *d2.value};
 }
 
+#if __cplusplus <= 199711
+# define DIGI(n) DIGI(n)
+#else
+# define DIGI(n) DIGI{n}
+#endif
+
 #endif