fix SCN_HAS_STD_REGEX_MULTILINE marco

microsoft · Oct 19, 2024 · 0249a3d · 0249a3d
1 parent da5024e
commit 0249a3d
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 1 deletion.
diff --git a/ports/scnlib/fix-SCN_HAS_STD_REGEX_MULTILINE-marco.patch b/ports/scnlib/fix-SCN_HAS_STD_REGEX_MULTILINE-marco.patch
@@ -0,0 +1,21 @@
+diff --git a/include/scn/fwd.h b/include/scn/fwd.h
+index 9b4892f..018a4f4 100644
+--- a/include/scn/fwd.h
++++ b/include/scn/fwd.h
+@@ -739,11 +739,11 @@ SCN_GCC_POP
+ #endif
+
+ // Detect std::regex_constants::multiline:
+-// libc++ 15 and later, or libstdc++ 11.4 or later
+-// (2021-09-29 is the date of the commit introducing `multiline`,
+-//  libstdc++ doesn't support checking for minor versions)
+-#if SCN_STDLIB_LIBCPP >= 15000 || SCN_STDLIB_GLIBCXX >= 12 || \
+-    (SCN_STDLIB_GLIBCXX == 11 && __GLIBCXX__ >= 20210929L)
++// libc++ 15 and later, or libstdc++ 12 or later
++
++
++#if SCN_STDLIB_LIBCPP >= 15000 || SCN_STDLIB_GLIBCXX >= 12 
++
+ #define SCN_HAS_STD_REGEX_MULTILINE 1
+ #else
+ #define SCN_HAS_STD_REGEX_MULTILINE 0
diff --git a/ports/scnlib/vcpkg.json b/ports/scnlib/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "scnlib",
   "version": "3.0.1",
+  "port-version": 1,
   "description": "scnlib is a modern C++ library for replacing scanf and std::istream",
   "homepage": "https://scnlib.dev/",
   "license": "Apache-2.0",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -8106,7 +8106,7 @@
     },
     "scnlib": {
       "baseline": "3.0.1",
-      "port-version": 0
+      "port-version": 1
     },
     "scope-guard": {
       "baseline": "1.1.0",

diff --git a/versions/s-/scnlib.json b/versions/s-/scnlib.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ead098e5e91b1454aa1e8570a2b11c5a52416989",
+      "version": "3.0.1",
+      "port-version": 1
+    },
     {
       "git-tree": "cbbd6d359bd0838808caa2ffd0982f87c8587fab",
       "version": "3.0.1",