Merge pull request #578 from puffetto/master

mrozigor · web-flow · commit 209f5ec67ddd · 2022-12-21T23:03:29.000+01:00
Apply workaround for Apple to FreeBSD aswell
diff --git a/include/crow/json.h b/include/crow/json.h
@@ -1653,7 +1653,7 @@ namespace crow
                 }
                 else
                 {
-#if defined(__APPLE__) || defined(__MACH__)
+#if defined(__APPLE__) || defined(__MACH__) || defined (__FreeBSD__)
                     o = std::unique_ptr<object>(new object(initializer_list));
 #else
                     (*o) = initializer_list;
@@ -1672,7 +1672,7 @@ namespace crow
                 }
                 else
                 {
-#if defined(__APPLE__) || defined(__MACH__)
+#if defined(__APPLE__) || defined(__MACH__) || defined (__FreeBSD__)
                     o = std::unique_ptr<object>(new object(value));
 #else
                     (*o) = value;

Original file line number	Diff line number	Diff line change
`@@ -1653,7 +1653,7 @@ namespace crow`
`1653`	`1653`	`}`
`1654`	`1654`	`else`
`1655`	`1655`	`{`
`1656`		`-#if defined(__APPLE__) \|\| defined(__MACH__)`
	`1656`	`+#if defined(__APPLE__) \|\| defined(__MACH__) \|\| defined (__FreeBSD__)`
`1657`	`1657`	`o = std::unique_ptr<object>(new object(initializer_list));`
`1658`	`1658`	`#else`
`1659`	`1659`	`(*o) = initializer_list;`
`@@ -1672,7 +1672,7 @@ namespace crow`
`1672`	`1672`	`}`
`1673`	`1673`	`else`
`1674`	`1674`	`{`
`1675`		`-#if defined(__APPLE__) \|\| defined(__MACH__)`
	`1675`	`+#if defined(__APPLE__) \|\| defined(__MACH__) \|\| defined (__FreeBSD__)`
`1676`	`1676`	`o = std::unique_ptr<object>(new object(value));`
`1677`	`1677`	`#else`
`1678`	`1678`	`(*o) = value;`