Allow implicit conversion

Fernthedev · Jan 25, 2024 · 44bdb89 · 44bdb89
1 parent b81f3c5
commit 44bdb89
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 6 deletions.
diff --git a/qpm.shared.json b/qpm.shared.json
@@ -1,5 +1,6 @@
 {
   "config": {
+    "version": "0.1.0",
     "sharedDir": "shared",
     "dependenciesDir": "extern",
     "info": {
@@ -9,13 +10,19 @@
       "url": "https://github.com/Fernthedev/paperlog",
       "additionalData": {
         "overrideSoName": "libpaperlog.so",
-        "cmake": true
+        "cmake": false
       }
     },
     "workspace": {
       "scripts": {
         "build": [
-          "pwsh ./build.ps1"
+          "pwsh ./scripts/build.ps1"
+        ],
+        "copy": [
+          "pwsh ./scripts/copy.ps1"
+        ],
+        "qmod": [
+          "pwsh ./scripts/createqmod.ps1 $0"
         ]
       }
     },

diff --git a/shared/logger.hpp b/shared/logger.hpp
@@ -8,6 +8,7 @@
 #include <chrono>
 #include <fmt/core.h>
 #include <thread>
+#include <type_traits>
 #include "log_level.hpp"
 #include "internal_logger.hpp"
 
@@ -262,6 +263,11 @@ template <std::size_t sz> struct ConstLoggerContext : public BaseLoggerContext<c
 
 struct LoggerContext : public BaseLoggerContext<std::string> {
   explicit LoggerContext(std::string_view s) : BaseLoggerContext<std::string>(std::string(s)) {}
+
+  // allow implicit conversion
+  template <typename U>
+  requires(std::is_constructible_v<std::string, U>)
+  LoggerContext(BaseLoggerContext<U> const& s) : BaseLoggerContext<std::string>(s.tag) {}
 };
 
 namespace Logger {

diff --git a/src_bootstrapper/scotland2/qpm.shared.json b/src_bootstrapper/scotland2/qpm.shared.json
@@ -1,5 +1,6 @@
 {
   "config": {
+    "version": "0.1.0",
     "sharedDir": "shared",
     "dependenciesDir": "extern",
     "info": {
@@ -8,10 +9,13 @@
       "version": "0.1.0",
       "url": null,
       "additionalData": {
+        "overrideSoName": "libpaperlog_sl2.so",
         "cmake": false
       }
     },
-    "workspace": null,
+    "workspace": {
+      "scripts": {}
+    },
     "dependencies": [
       {
         "id": "scotland2",
@@ -24,12 +28,15 @@
     {
       "dependency": {
         "id": "scotland2",
-        "versionRange": "=0.1.2",
+        "versionRange": "=0.1.3",
         "additionalData": {
-          "overrideSoName": "libsl2.so"
+          "soLink": "https://github.com/sc2ad/scotland2/releases/download/v0.1.3/libsl2.so",
+          "debugSoLink": "https://github.com/sc2ad/scotland2/releases/download/v0.1.3/debug_libsl2.so",
+          "overrideSoName": "libsl2.so",
+          "branchName": "version/v0_1_3"
         }
       },
-      "version": "0.1.2"
+      "version": "0.1.3"
     }
   ]
 }