diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000..1a71ec0 Binary files /dev/null and b/.DS_Store differ diff --git a/Dependencies/.DS_Store b/Dependencies/.DS_Store new file mode 100644 index 0000000..3341a8c Binary files /dev/null and b/Dependencies/.DS_Store differ diff --git a/Dependencies/nlohmann/json.hpp b/Dependencies/nlohmann/json.hpp index 06da815..7817023 100644 --- a/Dependencies/nlohmann/json.hpp +++ b/Dependencies/nlohmann/json.hpp @@ -36,7 +36,9 @@ SOFTWARE. #include // all_of, find, for_each #include // assert +#ifndef __APPLE__ #include // and, not, or +#endif #include // nullptr_t, ptrdiff_t, size_t #include // hash, less #include // initializer_list @@ -58,7 +60,9 @@ SOFTWARE. #include // transform #include // array +#ifndef __APPLE__ #include // and, not +#endif #include // forward_list #include // inserter, front_inserter, end #include // map @@ -2177,8 +2181,9 @@ class other_error : public exception // #include - +#ifndef __APPLE__ #include // not +#endif #include // size_t #include // conditional, enable_if, false_type, integral_constant, is_constructible, is_integral, is_same, remove_cv, remove_reference, true_type @@ -2242,8 +2247,9 @@ constexpr T static_const::value; // #include - +#ifndef __APPLE__ #include // not +#endif #include // numeric_limits #include // false_type, is_constructible, is_integral, is_same, true_type #include // declval @@ -2814,7 +2820,9 @@ struct is_constructible_tuple> : conjunction // array +#ifndef __APPLE__ #include // and +#endif #include // size_t #include // uint8_t #include // string @@ -3263,7 +3271,9 @@ constexpr const auto& from_json = detail::static_const::va #include // copy +#ifndef __APPLE__ #include // or, and, not +#endif #include // begin, end #include // string #include // tuple, get @@ -9298,8 +9308,9 @@ template struct internal_iterator // #include - +#ifndef __APPLE__ #include // not +#endif #include // iterator, random_access_iterator_tag, bidirectional_iterator_tag, advance, next #include // conditional, is_const, remove_const @@ -12634,7 +12645,9 @@ class binary_writer #include // reverse, remove, fill, find, none_of #include // array #include // assert +#ifndef __APPLE__ #include // and, or +#endif #include // localeconv, lconv #include // labs, isfinite, isnan, signbit #include // size_t, ptrdiff_t @@ -12650,7 +12663,9 @@ class binary_writer #include // array #include // assert +#ifndef __APPLE__ #include // or, and, not +#endif #include // signbit, isfinite #include // intN_t, uintN_t #include // memcpy, memmove