Skip to content

Delete Warnings compile on clang macOS #147

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
proboofficial wants to merge 1 commit into
base: main
Choose a base branch
from
+18 −3
Open

Delete Warnings compile on clang macOS #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added .DS_Store
View file
Open in desktop
Binary file not shown.
Binary file added Dependencies/.DS_Store
View file
Open in desktop
Copy link
Owner

@sdatkinson sdatkinson Aug 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remove .DS_Store files

Binary file not shown.
21 changes: 18 additions & 3 deletions Dependencies/nlohmann/json.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,9 @@ SOFTWARE.

#include <algorithm> // all_of, find, for_each
#include <cassert> // assert
#ifndef __APPLE__
Copy link
Owner

@sdatkinson sdatkinson Aug 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's defining __APPLE__? It's something outside of the scope of this repo?

If you can help explain to me what the issue is (ideally, point me to an issue on the repo that this comes from!) then that'll help me understand whether it's a good idea to deviate from nlohmann's code.

#include <ciso646> // and, not, or
#endif
#include <cstddef> // nullptr_t, ptrdiff_t, size_t
#include <functional> // hash, less
#include <initializer_list> // initializer_list
Expand All @@ -58,7 +60,9 @@ SOFTWARE.

#include <algorithm> // transform
#include <array> // array
#ifndef __APPLE__
#include <ciso646> // and, not
#endif
#include <forward_list> // forward_list
#include <iterator> // inserter, front_inserter, end
#include <map> // map
Expand Down Expand Up @@ -2177,8 +2181,9 @@ class other_error : public exception

// #include <nlohmann/detail/meta/cpp_future.hpp>


#ifndef __APPLE__
#include <ciso646> // not
#endif
#include <cstddef> // size_t
#include <type_traits> // conditional, enable_if, false_type, integral_constant, is_constructible, is_integral, is_same, remove_cv, remove_reference, true_type

Expand Down Expand Up @@ -2242,8 +2247,9 @@ constexpr T static_const<T>::value;

// #include <nlohmann/detail/meta/type_traits.hpp>


#ifndef __APPLE__
#include <ciso646> // not
#endif
#include <limits> // numeric_limits
#include <type_traits> // false_type, is_constructible, is_integral, is_same, true_type
#include <utility> // declval
Expand Down Expand Up @@ -2814,7 +2820,9 @@ struct is_constructible_tuple<T1, std::tuple<Args...>> : conjunction<std::is_con


#include <array> // array
#ifndef __APPLE__
#include <ciso646> // and
#endif
#include <cstddef> // size_t
#include <cstdint> // uint8_t
#include <string> // string
Expand Down Expand Up @@ -3263,7 +3271,9 @@ constexpr const auto& from_json = detail::static_const<detail::from_json_fn>::va


#include <algorithm> // copy
#ifndef __APPLE__
#include <ciso646> // or, and, not
#endif
#include <iterator> // begin, end
#include <string> // string
#include <tuple> // tuple, get
Expand Down Expand Up @@ -9298,8 +9308,9 @@ template<typename BasicJsonType> struct internal_iterator

// #include <nlohmann/detail/iterators/iter_impl.hpp>


#ifndef __APPLE__
#include <ciso646> // not
#endif
#include <iterator> // iterator, random_access_iterator_tag, bidirectional_iterator_tag, advance, next
#include <type_traits> // conditional, is_const, remove_const

Expand Down Expand Up @@ -12634,7 +12645,9 @@ class binary_writer
#include <algorithm> // reverse, remove, fill, find, none_of
#include <array> // array
#include <cassert> // assert
#ifndef __APPLE__
#include <ciso646> // and, or
#endif
#include <clocale> // localeconv, lconv
#include <cmath> // labs, isfinite, isnan, signbit
#include <cstddef> // size_t, ptrdiff_t
Expand All @@ -12650,7 +12663,9 @@ class binary_writer

#include <array> // array
#include <cassert> // assert
#ifndef __APPLE__
#include <ciso646> // or, and, not
#endif
#include <cmath> // signbit, isfinite
#include <cstdint> // intN_t, uintN_t
#include <cstring> // memcpy, memmove
Expand Down