more fixes related to the C++20 support

Author: noah1510

Pipfile.lock

@@ -36,7 +36,7 @@
       "-i"
     ],
     "file_patters": [
-      "include/unit_system.hpp",
+      "include/unit_system_17.hpp",
       "include/unit_system_20.hpp",
       "src/*.cpp"
     ]
@@ -46,7 +46,36 @@
       "command": [
         "meson",
         "setup",
-        "build",
+        "build_17",
+        "-Dcpp_std=c++17",
+        "--wipe"
+      ],
+      "environment": {
+        "colorize_console": "1"
+      }
+    },
+    {
+      "command": [
+        "meson",
+        "compile",
+        "-C",
+        "build_17"
+      ]
+    },
+    {
+      "command": [
+        "meson",
+        "test",
+        "-C",
+        "build_17"
+      ]
+    },
+    
+    {
+      "command": [
+        "meson",
+        "setup",
+        "build_20",
         "-Dcpp_std=c++20",
         "--wipe"
       ],
@@ -59,15 +88,15 @@
         "meson",
         "compile",
         "-C",
-        "build"
+        "build_20"
       ]
     },
     {
       "command": [
         "meson",
         "test",
         "-C",
-        "build"
+        "build_20"
       ]
     }
   ]

generator_code/targets/cppDesktop.json

@@ -36,7 +36,7 @@
       "-i"
     ],
     "file_patters": [
-      "include/unit_system.hpp",
+      "include/unit_system_17.hpp",
       "include/unit_system_20.hpp",
       "src/*.cpp"
     ]
@@ -46,7 +46,36 @@
       "command": [
         "meson",
         "setup",
-        "build",
+        "build_17",
+        "-Dcpp_std=c++17",
+        "--wipe"
+      ],
+      "environment": {
+        "colorize_console": "1"
+      }
+    },
+    {
+      "command": [
+        "meson",
+        "compile",
+        "-C",
+        "build_17"
+      ]
+    },
+    {
+      "command": [
+        "meson",
+        "test",
+        "-C",
+        "build_17"
+      ]
+    },
+    
+    {
+      "command": [
+        "meson",
+        "setup",
+        "build_20",
         "-Dcpp_std=c++20",
         "--wipe"
       ],
@@ -59,15 +88,15 @@
         "meson",
         "compile",
         "-C",
-        "build"
+        "build_20"
       ]
     },
     {
       "command": [
         "meson",
         "test",
         "-C",
-        "build"
+        "build_20"
       ]
     }
   ]

generator_code/targets/meson.json

@@ -30,8 +30,8 @@ void loop() {
 /* SI delay function */
 void delay_si(time_si& t){
   if(t <= 16383_us){ /* delayMicroseconds has a limit of 16838us */
-    delayMicroseconds(unit_cast(t, UNIT_SYSTEM_MICRO).value);
+    delayMicroseconds(unit_cast(t, UNIT_SYSTEM_MICRO).val());
   } else {
-    delay(unit_cast(t, UNIT_SYSTEM_MILLI).value);
+    delay(unit_cast(t, UNIT_SYSTEM_MILLI).val());
   }
 }

target_data/Cpp/arduino/examples/advanced_time/advanced_time.ino

@@ -18,8 +18,8 @@ void setup() {
 
 void loop() {
     digitalWrite(OUTPUT_LED, HIGH);
-    delay(delta_t.value);
+    delay(delta_t.val());
 
     digitalWrite(OUTPUT_LED, LOW);
-    delay(delta_t.value);
+    delay(delta_t.val());
 }

target_data/Cpp/arduino/examples/simple_time/simple_time.ino

@@ -0,0 +1,9 @@
+#pragma once
+
+#mesondefine USE_CPP_17
+
+#ifdef USE_CPP_17
+#include "unit_system_17.hpp"
+#else
+#include "unit_system_20.hpp"
+#endif

target_data/Cpp/cppDesktop/include/unit_system.hpp.in

@@ -1,3 +1,5 @@
+#include "test_functions.hpp"
+
 #include <iostream>
 
 using namespace sakurajin::unit_system;

target_data/Cpp/cppDesktop/include/unit_system.hpp.template renamed to target_data/Cpp/cppDesktop/include/unit_system_17.hpp.template

@@ -1,3 +1,5 @@
+#include "test_functions.hpp"
+
 #include <iostream>
 
 using namespace sakurajin::unit_system::literals;

target_data/Cpp/cppDesktop/tests/base_units_test.cpp

@@ -1,5 +1,5 @@
 #include <gtest/gtest.h>
 
-#include "unit_system_20.hpp"
+#include "unit_system.hpp"
 
 #define EXPECT_UNIT_EQ(X, Y) EXPECT_DOUBLE_EQ((X).val(), (Y).convert_like(X).val())

target_data/Cpp/cppDesktop/tests/base_units_test_17.cpp

@@ -1,4 +1,4 @@
-
+#include "test_functions.hpp"
 
 using namespace sakurajin::unit_system;
 

target_data/Cpp/cppDesktop/tests/base_units_test_20.cpp

@@ -9,6 +9,21 @@ project(
     meson_version: '>= 1.1.0',
 )
 
+use_cpp_17 = false
+if get_option('use_cpp_17').enabled()
+    use_cpp_17 = true
+elif get_option('use_cpp_17').disabled()
+    use_cpp_17 = false
+else
+    cpp_20_supported_versions = [
+        'c++20', 'c++23', 'c++26', 'c++2a',
+        'gnu++20', 'gnu++23', 'gnu++26', 'gnu++2a',
+        'vc++20', 'vc++23', 'vc++26', 'vc++2a',
+    ]
+    use_cpp_17 = get_option('cpp_std' ) not in cpp_20_supported_versions
+endif
+
+
 #set windows linker argument
 cpp = meson.get_compiler('cpp')
 
@@ -20,40 +35,54 @@ if target_machine.system() == 'windows'
     endif
 endif
 
-incdirs = include_directories('include')
-sources = [
-    {% for unit in units %}
-    'src/{{ unit.name }}.cpp',
-    {% endfor %}
-]
-
-unit_system = library(
-    'unit-system', 
-    sources,
-    version : meson.project_version(), 
-    soversion : '0',
-    include_directories : incdirs,
-    install : true,
-)
+incdirs = include_directories('include', '.')
 
-unit_system_dep = declare_dependency(
-    include_directories : incdirs,
-    link_with : unit_system,
-    version: meson.project_version(),
-)
+if use_cpp_17
+    sources = [
+        {% for unit in units %}
+        'src/{{ unit.name }}.cpp',
+        {% endfor %}
+    ]
 
-unit_system_20_dep = declare_dependency(
-    include_directories : incdirs,
-    version: meson.project_version(),
-)
+    unit_system = library(
+        'unit-system', 
+        sources,
+        version : meson.project_version(), 
+        soversion : '0',
+        include_directories : incdirs,
+        install : true,
+    )
+
+    unit_system_dep = declare_dependency(
+        include_directories : incdirs,
+        link_with : unit_system,
+        version: meson.project_version(),
+    )
+    
+    install_headers('include/unit_system_17.hpp', subdir : 'unit_system')
 
-pkg = import('pkgconfig')
-pkg.generate(unit_system, subdirs: 'unit_system')
+    pkg = import('pkgconfig')
+    pkg.generate(unit_system, subdirs: 'unit_system')
+else
+    unit_system_dep = declare_dependency(
+        include_directories : incdirs,
+        version: meson.project_version(),
+    )
+    
+    install_headers('include/unit_system_20.hpp', subdir : 'unit_system')
+endif
 
-install_headers('include/unit_system.hpp')
+conf_data = configuration_data()
+conf_data.set('USE_CPP_17', use_cpp_17)
+configure_file(
+    input : 'include/unit_system.hpp.in',
+    output : 'unit_system.hpp',
+    configuration : conf_data,
+    install: true,
+    install_dir: 'unit_system',
+)
 
 meson.override_dependency('unit-system', unit_system_dep)
-meson.override_dependency('unit-system-20', unit_system_20_dep)
 
 build_tests = get_option('build_tests').enable_auto_if(not meson.is_subproject())
 if build_tests.enabled()

target_data/Cpp/cppDesktop/tests/common_test.cpp

@@ -1 +1,2 @@
 option('build_tests', type : 'feature', value : 'auto', description: 'disable to not build tests when compiling directly. enable to also build tests if built as subproject')
+option('use_cpp_17', type : 'feature', value : 'auto', description: 'force the use of the c++17 variant if enabled, the c++20 version if disabled and auto detect based on cpp_std if auto.')