Merge pull request #168 from nx10/fix-crow-clang-18

Fix clang 18 issues
nx10 · Mar 10, 2024 · 3a13400 · 3a13400
2 parents 73392f8 + 7d99515
commit 3a13400
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -19,9 +19,9 @@ Depends:
 Imports: 
     unigd
 LinkingTo: 
+    unigd,
     cpp11 (>= 0.2.4),
-    AsioHeaders (>= 1.22.1),
-    unigd
+    AsioHeaders (>= 1.22.1)
 Suggests:
     testthat,
     xml2 (>= 1.0.0),

diff --git a/src/lib/crow/json.h b/src/lib/crow/json.h
@@ -1656,7 +1656,7 @@ namespace crow
                 }
                 else
                 {
-#if defined(__APPLE__) || defined(__MACH__) || defined(__FreeBSD__) || defined(__ANDROID__)
+#if defined(__APPLE__) || defined(__MACH__) || defined(__FreeBSD__) || defined(__ANDROID__) || defined(_LIBCPP_VERSION)
                     o = std::unique_ptr<object>(new object(initializer_list));
 #else
                     (*o) = initializer_list;
@@ -1675,7 +1675,7 @@ namespace crow
                 }
                 else
                 {
-#if defined(__APPLE__) || defined(__MACH__) || defined(__FreeBSD__) || defined(__ANDROID__)
+#if defined(__APPLE__) || defined(__MACH__) || defined(__FreeBSD__) || defined(__ANDROID__) || defined(_LIBCPP_VERSION)
                     o = std::unique_ptr<object>(new object(value));
 #else
                     (*o) = value;