sylar/OmniaFramework
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed release script

Browse source
This commit is contained in:
OmniaX-Dev 2026-03-08 23:13:56 +01:00
parent a110b0912f
commit 0556e6806c
46 changed files with 171 additions and 162 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
other/build.nr
View file

@ -1 +1 @@
2001 2007

13
other/create_release.sh
View file

@ -37,12 +37,21 @@ fi
mkdir -p $RELEASE_DIR/include/ostd/vendor mkdir -p $RELEASE_DIR/include/ostd/vendor
mkdir -p $RELEASE_DIR/include/ostd/vendor/midifile mkdir -p $RELEASE_DIR/include/ostd/vendor/midifile
mkdir -p $RELEASE_DIR/include/ostd/vendor/nlohmann mkdir -p $RELEASE_DIR/include/ostd/data_types
mkdir -p $RELEASE_DIR/include/ostd/io
mkdir -p $RELEASE_DIR/include/ostd/math
mkdir -p $RELEASE_DIR/include/ostd/string
mkdir -p $RELEASE_DIR/include/ostd/utils
mkdir -p $RELEASE_DIR/include/ogfx/ mkdir -p $RELEASE_DIR/include/ogfx/
find ../src/ostd -maxdepth 1 -name "*.h*" -exec cp {} $RELEASE_DIR/include/ostd \; find ../src/ostd -maxdepth 1 -name "*.h*" -exec cp {} $RELEASE_DIR/include/ostd \;
find ../src/ostd/data_types -maxdepth 1 -name "*.h*" -exec cp {} $RELEASE_DIR/include/ostd/data_types \;
find ../src/ostd/io -maxdepth 1 -name "*.h*" -exec cp {} $RELEASE_DIR/include/ostd/io \;
find ../src/ostd/math -maxdepth 1 -name "*.h*" -exec cp {} $RELEASE_DIR/include/ostd/math \;
find ../src/ostd/string -maxdepth 1 -name "*.h*" -exec cp {} $RELEASE_DIR/include/ostd/string \;
find ../src/ostd/utils -maxdepth 1 -name "*.h*" -exec cp {} $RELEASE_DIR/include/ostd/utils \;
find ../src/ogfx -maxdepth 1 -name "*.h*" -exec cp {} $RELEASE_DIR/include/ogfx \; find ../src/ogfx -maxdepth 1 -name "*.h*" -exec cp {} $RELEASE_DIR/include/ogfx \;
find ../src/ostd/vendor -maxdepth 1 -name "*.h*" -exec cp {} $RELEASE_DIR/include/ostd/vendor \; find ../src/ostd/vendor -maxdepth 1 -name "*.h*" -exec cp {} $RELEASE_DIR/include/ostd/vendor \;
find ../src/ostd/vendor/midifile -maxdepth 1 -name "*.h*" -exec cp {} $RELEASE_DIR/include/ostd/vendor/midifile \; find ../src/ostd/vendor/midifile -maxdepth 1 -name "*.h*" -exec cp {} $RELEASE_DIR/include/ostd/vendor/midifile \;
find ../src/ostd/vendor/nlohmann -maxdepth 1 -name "*.h*" -exec cp {} $RELEASE_DIR/include/ostd/vendor/nlohmann \; cp -r ../src/ostd/vendor/nlohmann $RELEASE_DIR/include/ostd/vendor/
cp -r ../licences $RELEASE_DIR cp -r ../licences $RELEASE_DIR
cp ../LICENSE $RELEASE_DIR/licences/OmniaFramework-LICENCE.txt cp ../LICENSE $RELEASE_DIR/licences/OmniaFramework-LICENCE.txt

2
src/ostd/io/Logger.hpp
View file

@ -53,7 +53,7 @@ namespace ostd
#define OX_LOG_DEBUG_ENABLED 1 #define OX_LOG_DEBUG_ENABLED 1
#define OX_LOG_TRACE_ENABLED 1 #define OX_LOG_TRACE_ENABLED 1
#if OX_RELEASE_BUILD == 1 #ifdef OX_RELEASE_BUILD
#define OX_LOG_DEBUG_ENABLED 0 #define OX_LOG_DEBUG_ENABLED 0
#define OX_LOG_TRACE_ENABLED 0 #define OX_LOG_TRACE_ENABLED 0
#endif #endif

8
src/ostd/vendor/nlohmann/adl_serializer.hpp vendored
View file

@ -10,10 +10,10 @@
#include <utility> #include <utility>
#include <nlohmann/detail/abi_macros.hpp> #include <ostd/vendor/nlohmann/detail/abi_macros.hpp>
#include <nlohmann/detail/conversions/from_json.hpp> #include <ostd/vendor/nlohmann/detail/conversions/from_json.hpp>
#include <nlohmann/detail/conversions/to_json.hpp> #include <ostd/vendor/nlohmann/detail/conversions/to_json.hpp>
#include <nlohmann/detail/meta/identity_tag.hpp> #include <ostd/vendor/nlohmann/detail/meta/identity_tag.hpp>
NLOHMANN_JSON_NAMESPACE_BEGIN NLOHMANN_JSON_NAMESPACE_BEGIN

2
src/ostd/vendor/nlohmann/byte_container_with_subtype.hpp vendored
View file

@ -12,7 +12,7 @@
#include <tuple> // tie #include <tuple> // tie
#include <utility> // move #include <utility> // move
#include <nlohmann/detail/abi_macros.hpp> #include <ostd/vendor/nlohmann/detail/abi_macros.hpp>
NLOHMANN_JSON_NAMESPACE_BEGIN NLOHMANN_JSON_NAMESPACE_BEGIN

16
src/ostd/vendor/nlohmann/detail/conversions/from_json.hpp vendored
View file

@ -23,14 +23,14 @@
#include <utility> // pair, declval #include <utility> // pair, declval
#include <valarray> // valarray #include <valarray> // valarray
#include <nlohmann/detail/exceptions.hpp> #include <ostd/vendor/nlohmann/detail/exceptions.hpp>
#include <nlohmann/detail/macro_scope.hpp> #include <ostd/vendor/nlohmann/detail/macro_scope.hpp>
#include <nlohmann/detail/meta/cpp_future.hpp> #include <ostd/vendor/nlohmann/detail/meta/cpp_future.hpp>
#include <nlohmann/detail/meta/identity_tag.hpp> #include <ostd/vendor/nlohmann/detail/meta/identity_tag.hpp>
#include <nlohmann/detail/meta/std_fs.hpp> #include <ostd/vendor/nlohmann/detail/meta/std_fs.hpp>
#include <nlohmann/detail/meta/type_traits.hpp> #include <ostd/vendor/nlohmann/detail/meta/type_traits.hpp>
#include <nlohmann/detail/string_concat.hpp> #include <ostd/vendor/nlohmann/detail/string_concat.hpp>
#include <nlohmann/detail/value_t.hpp> #include <ostd/vendor/nlohmann/detail/value_t.hpp>
NLOHMANN_JSON_NAMESPACE_BEGIN NLOHMANN_JSON_NAMESPACE_BEGIN
namespace detail namespace detail

2
src/ostd/vendor/nlohmann/detail/conversions/to_chars.hpp vendored
View file

@ -16,7 +16,7 @@
#include <limits> // numeric_limits #include <limits> // numeric_limits
#include <type_traits> // conditional #include <type_traits> // conditional
#include <nlohmann/detail/macro_scope.hpp> #include <ostd/vendor/nlohmann/detail/macro_scope.hpp>
NLOHMANN_JSON_NAMESPACE_BEGIN NLOHMANN_JSON_NAMESPACE_BEGIN
namespace detail namespace detail

12
src/ostd/vendor/nlohmann/detail/conversions/to_json.hpp vendored
View file

@ -8,7 +8,7 @@
#pragma once #pragma once
#include <nlohmann/detail/macro_scope.hpp> // JSON_HAS_CPP_17 #include <ostd/vendor/nlohmann/detail/macro_scope.hpp> // JSON_HAS_CPP_17
#ifdef JSON_HAS_CPP_17 #ifdef JSON_HAS_CPP_17
#include <optional> // optional #include <optional> // optional
#endif #endif
@ -22,11 +22,11 @@
#include <valarray> // valarray #include <valarray> // valarray
#include <vector> // vector #include <vector> // vector
#include <nlohmann/detail/iterators/iteration_proxy.hpp> #include <ostd/vendor/nlohmann/detail/iterators/iteration_proxy.hpp>
#include <nlohmann/detail/meta/cpp_future.hpp> #include <ostd/vendor/nlohmann/detail/meta/cpp_future.hpp>
#include <nlohmann/detail/meta/std_fs.hpp> #include <ostd/vendor/nlohmann/detail/meta/std_fs.hpp>
#include <nlohmann/detail/meta/type_traits.hpp> #include <ostd/vendor/nlohmann/detail/meta/type_traits.hpp>
#include <nlohmann/detail/value_t.hpp> #include <ostd/vendor/nlohmann/detail/value_t.hpp>
NLOHMANN_JSON_NAMESPACE_BEGIN NLOHMANN_JSON_NAMESPACE_BEGIN
namespace detail namespace detail

14
src/ostd/vendor/nlohmann/detail/exceptions.hpp vendored
View file

@ -17,13 +17,13 @@
#include <string> // to_string #include <string> // to_string
#include <vector> // vector #include <vector> // vector
#include <nlohmann/detail/value_t.hpp> #include <ostd/vendor/nlohmann/detail/value_t.hpp>
#include <nlohmann/detail/string_escape.hpp> #include <ostd/vendor/nlohmann/detail/string_escape.hpp>
#include <nlohmann/detail/input/position_t.hpp> #include <ostd/vendor/nlohmann/detail/input/position_t.hpp>
#include <nlohmann/detail/macro_scope.hpp> #include <ostd/vendor/nlohmann/detail/macro_scope.hpp>
#include <nlohmann/detail/meta/cpp_future.hpp> #include <ostd/vendor/nlohmann/detail/meta/cpp_future.hpp>
#include <nlohmann/detail/meta/type_traits.hpp> #include <ostd/vendor/nlohmann/detail/meta/type_traits.hpp>
#include <nlohmann/detail/string_concat.hpp> #include <ostd/vendor/nlohmann/detail/string_concat.hpp>
// With -Wweak-vtables, Clang will complain about the exception classes as they // With -Wweak-vtables, Clang will complain about the exception classes as they
// have no out-of-line virtual method definitions and their vtable will be // have no out-of-line virtual method definitions and their vtable will be

4
src/ostd/vendor/nlohmann/detail/hash.hpp vendored
View file

@ -12,8 +12,8 @@
#include <cstddef> // size_t #include <cstddef> // size_t
#include <functional> // hash #include <functional> // hash
#include <nlohmann/detail/abi_macros.hpp> #include <ostd/vendor/nlohmann/detail/abi_macros.hpp>
#include <nlohmann/detail/value_t.hpp> #include <ostd/vendor/nlohmann/detail/value_t.hpp>
NLOHMANN_JSON_NAMESPACE_BEGIN NLOHMANN_JSON_NAMESPACE_BEGIN
namespace detail namespace detail

18
src/ostd/vendor/nlohmann/detail/input/binary_reader.hpp vendored
View file

@ -24,15 +24,15 @@
#include <bit> //byteswap #include <bit> //byteswap
#endif #endif
#include <nlohmann/detail/exceptions.hpp> #include <ostd/vendor/nlohmann/detail/exceptions.hpp>
#include <nlohmann/detail/input/input_adapters.hpp> #include <ostd/vendor/nlohmann/detail/input/input_adapters.hpp>
#include <nlohmann/detail/input/json_sax.hpp> #include <ostd/vendor/nlohmann/detail/input/json_sax.hpp>
#include <nlohmann/detail/input/lexer.hpp> #include <ostd/vendor/nlohmann/detail/input/lexer.hpp>
#include <nlohmann/detail/macro_scope.hpp> #include <ostd/vendor/nlohmann/detail/macro_scope.hpp>
#include <nlohmann/detail/meta/is_sax.hpp> #include <ostd/vendor/nlohmann/detail/meta/is_sax.hpp>
#include <nlohmann/detail/meta/type_traits.hpp> #include <ostd/vendor/nlohmann/detail/meta/type_traits.hpp>
#include <nlohmann/detail/string_concat.hpp> #include <ostd/vendor/nlohmann/detail/string_concat.hpp>
#include <nlohmann/detail/value_t.hpp> #include <ostd/vendor/nlohmann/detail/value_t.hpp>
NLOHMANN_JSON_NAMESPACE_BEGIN NLOHMANN_JSON_NAMESPACE_BEGIN
namespace detail namespace detail

8
src/ostd/vendor/nlohmann/detail/input/input_adapters.hpp vendored
View file

@ -23,10 +23,10 @@
#include <istream> // istream #include <istream> // istream
#endif // JSON_NO_IO #endif // JSON_NO_IO
#include <nlohmann/detail/exceptions.hpp> #include <ostd/vendor/nlohmann/detail/exceptions.hpp>
#include <nlohmann/detail/iterators/iterator_traits.hpp> #include <ostd/vendor/nlohmann/detail/iterators/iterator_traits.hpp>
#include <nlohmann/detail/macro_scope.hpp> #include <ostd/vendor/nlohmann/detail/macro_scope.hpp>
#include <nlohmann/detail/meta/type_traits.hpp> #include <ostd/vendor/nlohmann/detail/meta/type_traits.hpp>
NLOHMANN_JSON_NAMESPACE_BEGIN NLOHMANN_JSON_NAMESPACE_BEGIN
namespace detail namespace detail

8
src/ostd/vendor/nlohmann/detail/input/json_sax.hpp vendored
View file

@ -14,10 +14,10 @@
#include <utility> // move #include <utility> // move
#include <vector> // vector #include <vector> // vector
#include <nlohmann/detail/exceptions.hpp> #include <ostd/vendor/nlohmann/detail/exceptions.hpp>
#include <nlohmann/detail/input/lexer.hpp> #include <ostd/vendor/nlohmann/detail/input/lexer.hpp>
#include <nlohmann/detail/macro_scope.hpp> #include <ostd/vendor/nlohmann/detail/macro_scope.hpp>
#include <nlohmann/detail/string_concat.hpp> #include <ostd/vendor/nlohmann/detail/string_concat.hpp>
NLOHMANN_JSON_NAMESPACE_BEGIN NLOHMANN_JSON_NAMESPACE_BEGIN
/*! /*!

8
src/ostd/vendor/nlohmann/detail/input/lexer.hpp vendored
View file

@ -18,10 +18,10 @@
#include <utility> // move #include <utility> // move
#include <vector> // vector #include <vector> // vector
#include <nlohmann/detail/input/input_adapters.hpp> #include <ostd/vendor/nlohmann/detail/input/input_adapters.hpp>
#include <nlohmann/detail/input/position_t.hpp> #include <ostd/vendor/nlohmann/detail/input/position_t.hpp>
#include <nlohmann/detail/macro_scope.hpp> #include <ostd/vendor/nlohmann/detail/macro_scope.hpp>
#include <nlohmann/detail/meta/type_traits.hpp> #include <ostd/vendor/nlohmann/detail/meta/type_traits.hpp>
NLOHMANN_JSON_NAMESPACE_BEGIN NLOHMANN_JSON_NAMESPACE_BEGIN
namespace detail namespace detail

16
src/ostd/vendor/nlohmann/detail/input/parser.hpp vendored
View file

@ -15,14 +15,14 @@
#include <utility> // move #include <utility> // move
#include <vector> // vector #include <vector> // vector
#include <nlohmann/detail/exceptions.hpp> #include <ostd/vendor/nlohmann/detail/exceptions.hpp>
#include <nlohmann/detail/input/input_adapters.hpp> #include <ostd/vendor/nlohmann/detail/input/input_adapters.hpp>
#include <nlohmann/detail/input/json_sax.hpp> #include <ostd/vendor/nlohmann/detail/input/json_sax.hpp>
#include <nlohmann/detail/input/lexer.hpp> #include <ostd/vendor/nlohmann/detail/input/lexer.hpp>
#include <nlohmann/detail/macro_scope.hpp> #include <ostd/vendor/nlohmann/detail/macro_scope.hpp>
#include <nlohmann/detail/meta/is_sax.hpp> #include <ostd/vendor/nlohmann/detail/meta/is_sax.hpp>
#include <nlohmann/detail/string_concat.hpp> #include <ostd/vendor/nlohmann/detail/string_concat.hpp>
#include <nlohmann/detail/value_t.hpp> #include <ostd/vendor/nlohmann/detail/value_t.hpp>
NLOHMANN_JSON_NAMESPACE_BEGIN NLOHMANN_JSON_NAMESPACE_BEGIN
namespace detail namespace detail

2
src/ostd/vendor/nlohmann/detail/input/position_t.hpp vendored
View file

@ -10,7 +10,7 @@
#include <cstddef> // size_t #include <cstddef> // size_t
#include <nlohmann/detail/abi_macros.hpp> #include <ostd/vendor/nlohmann/detail/abi_macros.hpp>
NLOHMANN_JSON_NAMESPACE_BEGIN NLOHMANN_JSON_NAMESPACE_BEGIN
namespace detail namespace detail

4
src/ostd/vendor/nlohmann/detail/iterators/internal_iterator.hpp vendored
View file

@ -8,8 +8,8 @@
#pragma once #pragma once
#include <nlohmann/detail/abi_macros.hpp> #include <ostd/vendor/nlohmann/detail/abi_macros.hpp>
#include <nlohmann/detail/iterators/primitive_iterator.hpp> #include <ostd/vendor/nlohmann/detail/iterators/primitive_iterator.hpp>
NLOHMANN_JSON_NAMESPACE_BEGIN NLOHMANN_JSON_NAMESPACE_BEGIN
namespace detail namespace detail

14
src/ostd/vendor/nlohmann/detail/iterators/iter_impl.hpp vendored
View file

@ -11,13 +11,13 @@
#include <iterator> // iterator, random_access_iterator_tag, bidirectional_iterator_tag, advance, next #include <iterator> // iterator, random_access_iterator_tag, bidirectional_iterator_tag, advance, next
#include <type_traits> // conditional, is_const, remove_const #include <type_traits> // conditional, is_const, remove_const
#include <nlohmann/detail/exceptions.hpp> #include <ostd/vendor/nlohmann/detail/exceptions.hpp>
#include <nlohmann/detail/iterators/internal_iterator.hpp> #include <ostd/vendor/nlohmann/detail/iterators/internal_iterator.hpp>
#include <nlohmann/detail/iterators/primitive_iterator.hpp> #include <ostd/vendor/nlohmann/detail/iterators/primitive_iterator.hpp>
#include <nlohmann/detail/macro_scope.hpp> #include <ostd/vendor/nlohmann/detail/macro_scope.hpp>
#include <nlohmann/detail/meta/cpp_future.hpp> #include <ostd/vendor/nlohmann/detail/meta/cpp_future.hpp>
#include <nlohmann/detail/meta/type_traits.hpp> #include <ostd/vendor/nlohmann/detail/meta/type_traits.hpp>
#include <nlohmann/detail/value_t.hpp> #include <ostd/vendor/nlohmann/detail/value_t.hpp>
NLOHMANN_JSON_NAMESPACE_BEGIN NLOHMANN_JSON_NAMESPACE_BEGIN
namespace detail namespace detail

8
src/ostd/vendor/nlohmann/detail/iterators/iteration_proxy.hpp vendored
View file

@ -17,10 +17,10 @@
#include <ranges> // enable_borrowed_range #include <ranges> // enable_borrowed_range
#endif #endif
#include <nlohmann/detail/abi_macros.hpp> #include <ostd/vendor/nlohmann/detail/abi_macros.hpp>
#include <nlohmann/detail/meta/type_traits.hpp> #include <ostd/vendor/nlohmann/detail/meta/type_traits.hpp>
#include <nlohmann/detail/string_utils.hpp> #include <ostd/vendor/nlohmann/detail/string_utils.hpp>
#include <nlohmann/detail/value_t.hpp> #include <ostd/vendor/nlohmann/detail/value_t.hpp>
NLOHMANN_JSON_NAMESPACE_BEGIN NLOHMANN_JSON_NAMESPACE_BEGIN
namespace detail namespace detail

6
src/ostd/vendor/nlohmann/detail/iterators/iterator_traits.hpp vendored
View file

@ -10,9 +10,9 @@
#include <iterator> // random_access_iterator_tag #include <iterator> // random_access_iterator_tag
#include <nlohmann/detail/abi_macros.hpp> #include <ostd/vendor/nlohmann/detail/abi_macros.hpp>
#include <nlohmann/detail/meta/void_t.hpp> #include <ostd/vendor/nlohmann/detail/meta/void_t.hpp>
#include <nlohmann/detail/meta/cpp_future.hpp> #include <ostd/vendor/nlohmann/detail/meta/cpp_future.hpp>
NLOHMANN_JSON_NAMESPACE_BEGIN NLOHMANN_JSON_NAMESPACE_BEGIN
namespace detail namespace detail

2
src/ostd/vendor/nlohmann/detail/iterators/json_reverse_iterator.hpp vendored
View file

@ -12,7 +12,7 @@
#include <iterator> // reverse_iterator #include <iterator> // reverse_iterator
#include <utility> // declval #include <utility> // declval
#include <nlohmann/detail/abi_macros.hpp> #include <ostd/vendor/nlohmann/detail/abi_macros.hpp>
NLOHMANN_JSON_NAMESPACE_BEGIN NLOHMANN_JSON_NAMESPACE_BEGIN
namespace detail namespace detail

2
src/ostd/vendor/nlohmann/detail/iterators/primitive_iterator.hpp vendored
View file

@ -11,7 +11,7 @@
#include <cstddef> // ptrdiff_t #include <cstddef> // ptrdiff_t
#include <limits> // numeric_limits #include <limits> // numeric_limits
#include <nlohmann/detail/macro_scope.hpp> #include <ostd/vendor/nlohmann/detail/macro_scope.hpp>
NLOHMANN_JSON_NAMESPACE_BEGIN NLOHMANN_JSON_NAMESPACE_BEGIN
namespace detail namespace detail

2
src/ostd/vendor/nlohmann/detail/json_custom_base_class.hpp vendored
View file

@ -10,7 +10,7 @@
#include <type_traits> // conditional, is_same #include <type_traits> // conditional, is_same
#include <nlohmann/detail/abi_macros.hpp> #include <ostd/vendor/nlohmann/detail/abi_macros.hpp>
NLOHMANN_JSON_NAMESPACE_BEGIN NLOHMANN_JSON_NAMESPACE_BEGIN
namespace detail namespace detail

10
src/ostd/vendor/nlohmann/detail/json_pointer.hpp vendored
View file

@ -21,11 +21,11 @@
#include <utility> // move #include <utility> // move
#include <vector> // vector #include <vector> // vector
#include <nlohmann/detail/exceptions.hpp> #include <ostd/vendor/nlohmann/detail/exceptions.hpp>
#include <nlohmann/detail/macro_scope.hpp> #include <ostd/vendor/nlohmann/detail/macro_scope.hpp>
#include <nlohmann/detail/string_concat.hpp> #include <ostd/vendor/nlohmann/detail/string_concat.hpp>
#include <nlohmann/detail/string_escape.hpp> #include <ostd/vendor/nlohmann/detail/string_escape.hpp>
#include <nlohmann/detail/value_t.hpp> #include <ostd/vendor/nlohmann/detail/value_t.hpp>
NLOHMANN_JSON_NAMESPACE_BEGIN NLOHMANN_JSON_NAMESPACE_BEGIN

4
src/ostd/vendor/nlohmann/detail/json_ref.hpp vendored
View file

@ -11,8 +11,8 @@
#include <initializer_list> #include <initializer_list>
#include <utility> #include <utility>
#include <nlohmann/detail/abi_macros.hpp> #include <ostd/vendor/nlohmann/detail/abi_macros.hpp>
#include <nlohmann/detail/meta/type_traits.hpp> #include <ostd/vendor/nlohmann/detail/meta/type_traits.hpp>
NLOHMANN_JSON_NAMESPACE_BEGIN NLOHMANN_JSON_NAMESPACE_BEGIN
namespace detail namespace detail

6
src/ostd/vendor/nlohmann/detail/macro_scope.hpp vendored
View file

@ -9,13 +9,13 @@
#pragma once #pragma once
#include <utility> // declval, pair #include <utility> // declval, pair
#include <nlohmann/detail/meta/detected.hpp> #include <ostd/vendor/nlohmann/detail/meta/detected.hpp>
#include <nlohmann/thirdparty/hedley/hedley.hpp> #include <ostd/vendor/nlohmann/thirdparty/hedley/hedley.hpp>
// This file contains all internal macro definitions (except those affecting ABI) // This file contains all internal macro definitions (except those affecting ABI)
// You MUST include macro_unscope.hpp at the end of json.hpp to undef all of them // You MUST include macro_unscope.hpp at the end of json.hpp to undef all of them
#include <nlohmann/detail/abi_macros.hpp> #include <ostd/vendor/nlohmann/detail/abi_macros.hpp>
// exclude unsupported compilers // exclude unsupported compilers
#if !defined(JSON_SKIP_UNSUPPORTED_COMPILER_CHECK) #if !defined(JSON_SKIP_UNSUPPORTED_COMPILER_CHECK)

2
src/ostd/vendor/nlohmann/detail/macro_unscope.hpp vendored
View file

@ -43,4 +43,4 @@
#undef JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON #undef JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON
#endif #endif
#include <nlohmann/thirdparty/hedley/hedley_undef.hpp> #include <ostd/vendor/nlohmann/thirdparty/hedley/hedley_undef.hpp>

2
src/ostd/vendor/nlohmann/detail/meta/call_std/begin.hpp vendored
View file

@ -8,7 +8,7 @@
#pragma once #pragma once
#include <nlohmann/detail/macro_scope.hpp> #include <ostd/vendor/nlohmann/detail/macro_scope.hpp>
NLOHMANN_JSON_NAMESPACE_BEGIN NLOHMANN_JSON_NAMESPACE_BEGIN

2
src/ostd/vendor/nlohmann/detail/meta/call_std/end.hpp vendored
View file

@ -8,7 +8,7 @@
#pragma once #pragma once
#include <nlohmann/detail/macro_scope.hpp> #include <ostd/vendor/nlohmann/detail/macro_scope.hpp>
NLOHMANN_JSON_NAMESPACE_BEGIN NLOHMANN_JSON_NAMESPACE_BEGIN

2
src/ostd/vendor/nlohmann/detail/meta/cpp_future.hpp vendored
View file

@ -14,7 +14,7 @@
#include <type_traits> // conditional, enable_if, false_type, integral_constant, is_constructible, is_integral, is_same, remove_cv, remove_reference, true_type #include <type_traits> // conditional, enable_if, false_type, integral_constant, is_constructible, is_integral, is_same, remove_cv, remove_reference, true_type
#include <utility> // index_sequence, make_index_sequence, index_sequence_for #include <utility> // index_sequence, make_index_sequence, index_sequence_for
#include <nlohmann/detail/macro_scope.hpp> #include <ostd/vendor/nlohmann/detail/macro_scope.hpp>
NLOHMANN_JSON_NAMESPACE_BEGIN NLOHMANN_JSON_NAMESPACE_BEGIN
namespace detail namespace detail

2
src/ostd/vendor/nlohmann/detail/meta/detected.hpp vendored
View file

@ -10,7 +10,7 @@
#include <type_traits> #include <type_traits>
#include <nlohmann/detail/meta/void_t.hpp> #include <ostd/vendor/nlohmann/detail/meta/void_t.hpp>
NLOHMANN_JSON_NAMESPACE_BEGIN NLOHMANN_JSON_NAMESPACE_BEGIN
namespace detail namespace detail

2
src/ostd/vendor/nlohmann/detail/meta/identity_tag.hpp vendored
View file

@ -8,7 +8,7 @@
#pragma once #pragma once
#include <nlohmann/detail/abi_macros.hpp> #include <ostd/vendor/nlohmann/detail/abi_macros.hpp>
NLOHMANN_JSON_NAMESPACE_BEGIN NLOHMANN_JSON_NAMESPACE_BEGIN
namespace detail namespace detail

6
src/ostd/vendor/nlohmann/detail/meta/is_sax.hpp vendored
View file

@ -12,9 +12,9 @@
#include <utility> // declval #include <utility> // declval
#include <string> // string #include <string> // string
#include <nlohmann/detail/abi_macros.hpp> #include <ostd/vendor/nlohmann/detail/abi_macros.hpp>
#include <nlohmann/detail/meta/detected.hpp> #include <ostd/vendor/nlohmann/detail/meta/detected.hpp>
#include <nlohmann/detail/meta/type_traits.hpp> #include <ostd/vendor/nlohmann/detail/meta/type_traits.hpp>
NLOHMANN_JSON_NAMESPACE_BEGIN NLOHMANN_JSON_NAMESPACE_BEGIN
namespace detail namespace detail

2
src/ostd/vendor/nlohmann/detail/meta/std_fs.hpp vendored
View file

@ -8,7 +8,7 @@
#pragma once #pragma once
#include <nlohmann/detail/macro_scope.hpp> #include <ostd/vendor/nlohmann/detail/macro_scope.hpp>
#if JSON_HAS_EXPERIMENTAL_FILESYSTEM #if JSON_HAS_EXPERIMENTAL_FILESYSTEM
#include <experimental/filesystem> #include <experimental/filesystem>

14
src/ostd/vendor/nlohmann/detail/meta/type_traits.hpp vendored
View file

@ -14,13 +14,13 @@
#include <type_traits> // false_type, is_constructible, is_integral, is_same, true_type #include <type_traits> // false_type, is_constructible, is_integral, is_same, true_type
#include <utility> // declval #include <utility> // declval
#include <nlohmann/detail/iterators/iterator_traits.hpp> #include <ostd/vendor/nlohmann/detail/iterators/iterator_traits.hpp>
#include <nlohmann/detail/macro_scope.hpp> #include <ostd/vendor/nlohmann/detail/macro_scope.hpp>
#include <nlohmann/detail/meta/call_std/begin.hpp> #include <ostd/vendor/nlohmann/detail/meta/call_std/begin.hpp>
#include <nlohmann/detail/meta/call_std/end.hpp> #include <ostd/vendor/nlohmann/detail/meta/call_std/end.hpp>
#include <nlohmann/detail/meta/cpp_future.hpp> #include <ostd/vendor/nlohmann/detail/meta/cpp_future.hpp>
#include <nlohmann/detail/meta/detected.hpp> #include <ostd/vendor/nlohmann/detail/meta/detected.hpp>
#include <nlohmann/json_fwd.hpp> #include <ostd/vendor/nlohmann/json_fwd.hpp>
NLOHMANN_JSON_NAMESPACE_BEGIN NLOHMANN_JSON_NAMESPACE_BEGIN
/*! /*!

2
src/ostd/vendor/nlohmann/detail/meta/void_t.hpp vendored
View file

@ -8,7 +8,7 @@
#pragma once #pragma once
#include <nlohmann/detail/abi_macros.hpp> #include <ostd/vendor/nlohmann/detail/abi_macros.hpp>
NLOHMANN_JSON_NAMESPACE_BEGIN NLOHMANN_JSON_NAMESPACE_BEGIN
namespace detail namespace detail

8
src/ostd/vendor/nlohmann/detail/output/binary_writer.hpp vendored
View file

@ -19,10 +19,10 @@
#include <utility> // move #include <utility> // move
#include <vector> // vector #include <vector> // vector
#include <nlohmann/detail/input/binary_reader.hpp> #include <ostd/vendor/nlohmann/detail/input/binary_reader.hpp>
#include <nlohmann/detail/macro_scope.hpp> #include <ostd/vendor/nlohmann/detail/macro_scope.hpp>
#include <nlohmann/detail/output/output_adapters.hpp> #include <ostd/vendor/nlohmann/detail/output/output_adapters.hpp>
#include <nlohmann/detail/string_concat.hpp> #include <ostd/vendor/nlohmann/detail/string_concat.hpp>
NLOHMANN_JSON_NAMESPACE_BEGIN NLOHMANN_JSON_NAMESPACE_BEGIN
namespace detail namespace detail

2
src/ostd/vendor/nlohmann/detail/output/output_adapters.hpp vendored
View file

@ -20,7 +20,7 @@
#include <ostream> // basic_ostream #include <ostream> // basic_ostream
#endif // JSON_NO_IO #endif // JSON_NO_IO
#include <nlohmann/detail/macro_scope.hpp> #include <ostd/vendor/nlohmann/detail/macro_scope.hpp>
NLOHMANN_JSON_NAMESPACE_BEGIN NLOHMANN_JSON_NAMESPACE_BEGIN
namespace detail namespace detail

16
src/ostd/vendor/nlohmann/detail/output/serializer.hpp vendored
View file

@ -22,14 +22,14 @@
#include <type_traits> // is_same #include <type_traits> // is_same
#include <utility> // move #include <utility> // move
#include <nlohmann/detail/conversions/to_chars.hpp> #include <ostd/vendor/nlohmann/detail/conversions/to_chars.hpp>
#include <nlohmann/detail/exceptions.hpp> #include <ostd/vendor/nlohmann/detail/exceptions.hpp>
#include <nlohmann/detail/macro_scope.hpp> #include <ostd/vendor/nlohmann/detail/macro_scope.hpp>
#include <nlohmann/detail/meta/cpp_future.hpp> #include <ostd/vendor/nlohmann/detail/meta/cpp_future.hpp>
#include <nlohmann/detail/output/binary_writer.hpp> #include <ostd/vendor/nlohmann/detail/output/binary_writer.hpp>
#include <nlohmann/detail/output/output_adapters.hpp> #include <ostd/vendor/nlohmann/detail/output/output_adapters.hpp>
#include <nlohmann/detail/string_concat.hpp> #include <ostd/vendor/nlohmann/detail/string_concat.hpp>
#include <nlohmann/detail/value_t.hpp> #include <ostd/vendor/nlohmann/detail/value_t.hpp>
NLOHMANN_JSON_NAMESPACE_BEGIN NLOHMANN_JSON_NAMESPACE_BEGIN
namespace detail namespace detail

4
src/ostd/vendor/nlohmann/detail/string_concat.hpp vendored
View file

@ -12,8 +12,8 @@
#include <string> // string #include <string> // string
#include <utility> // forward #include <utility> // forward
#include <nlohmann/detail/meta/cpp_future.hpp> #include <ostd/vendor/nlohmann/detail/meta/cpp_future.hpp>
#include <nlohmann/detail/meta/detected.hpp> #include <ostd/vendor/nlohmann/detail/meta/detected.hpp>
NLOHMANN_JSON_NAMESPACE_BEGIN NLOHMANN_JSON_NAMESPACE_BEGIN
namespace detail namespace detail

2
src/ostd/vendor/nlohmann/detail/string_escape.hpp vendored
View file

@ -8,7 +8,7 @@
#pragma once #pragma once
#include <nlohmann/detail/abi_macros.hpp> #include <ostd/vendor/nlohmann/detail/abi_macros.hpp>
NLOHMANN_JSON_NAMESPACE_BEGIN NLOHMANN_JSON_NAMESPACE_BEGIN
namespace detail namespace detail

2
src/ostd/vendor/nlohmann/detail/string_utils.hpp vendored
View file

@ -11,7 +11,7 @@
#include <cstddef> // size_t #include <cstddef> // size_t
#include <string> // string, to_string #include <string> // string, to_string
#include <nlohmann/detail/abi_macros.hpp> #include <ostd/vendor/nlohmann/detail/abi_macros.hpp>
NLOHMANN_JSON_NAMESPACE_BEGIN NLOHMANN_JSON_NAMESPACE_BEGIN
namespace detail namespace detail

2
src/ostd/vendor/nlohmann/detail/value_t.hpp vendored
View file

@ -13,7 +13,7 @@
#include <cstdint> // uint8_t #include <cstdint> // uint8_t
#include <string> // string #include <string> // string
#include <nlohmann/detail/macro_scope.hpp> #include <ostd/vendor/nlohmann/detail/macro_scope.hpp>
#if JSON_HAS_THREE_WAY_COMPARISON #if JSON_HAS_THREE_WAY_COMPARISON
#include <compare> // partial_ordering #include <compare> // partial_ordering
#endif #endif

62
src/ostd/vendor/nlohmann/json.hpp vendored
View file

@ -31,36 +31,36 @@
#include <utility> // declval, forward, move, pair, swap #include <utility> // declval, forward, move, pair, swap
#include <vector> // vector #include <vector> // vector
#include <nlohmann/adl_serializer.hpp> #include <ostd/vendor/nlohmann/adl_serializer.hpp>
#include <nlohmann/byte_container_with_subtype.hpp> #include <ostd/vendor/nlohmann/byte_container_with_subtype.hpp>
#include <nlohmann/detail/conversions/from_json.hpp> #include <ostd/vendor/nlohmann/detail/conversions/from_json.hpp>
#include <nlohmann/detail/conversions/to_json.hpp> #include <ostd/vendor/nlohmann/detail/conversions/to_json.hpp>
#include <nlohmann/detail/exceptions.hpp> #include <ostd/vendor/nlohmann/detail/exceptions.hpp>
#include <nlohmann/detail/hash.hpp> #include <ostd/vendor/nlohmann/detail/hash.hpp>
#include <nlohmann/detail/input/binary_reader.hpp> #include <ostd/vendor/nlohmann/detail/input/binary_reader.hpp>
#include <nlohmann/detail/input/input_adapters.hpp> #include <ostd/vendor/nlohmann/detail/input/input_adapters.hpp>
#include <nlohmann/detail/input/lexer.hpp> #include <ostd/vendor/nlohmann/detail/input/lexer.hpp>
#include <nlohmann/detail/input/parser.hpp> #include <ostd/vendor/nlohmann/detail/input/parser.hpp>
#include <nlohmann/detail/iterators/internal_iterator.hpp> #include <ostd/vendor/nlohmann/detail/iterators/internal_iterator.hpp>
#include <nlohmann/detail/iterators/iter_impl.hpp> #include <ostd/vendor/nlohmann/detail/iterators/iter_impl.hpp>
#include <nlohmann/detail/iterators/iteration_proxy.hpp> #include <ostd/vendor/nlohmann/detail/iterators/iteration_proxy.hpp>
#include <nlohmann/detail/iterators/json_reverse_iterator.hpp> #include <ostd/vendor/nlohmann/detail/iterators/json_reverse_iterator.hpp>
#include <nlohmann/detail/iterators/primitive_iterator.hpp> #include <ostd/vendor/nlohmann/detail/iterators/primitive_iterator.hpp>
#include <nlohmann/detail/json_custom_base_class.hpp> #include <ostd/vendor/nlohmann/detail/json_custom_base_class.hpp>
#include <nlohmann/detail/json_pointer.hpp> #include <ostd/vendor/nlohmann/detail/json_pointer.hpp>
#include <nlohmann/detail/json_ref.hpp> #include <ostd/vendor/nlohmann/detail/json_ref.hpp>
#include <nlohmann/detail/macro_scope.hpp> #include <ostd/vendor/nlohmann/detail/macro_scope.hpp>
#include <nlohmann/detail/string_concat.hpp> #include <ostd/vendor/nlohmann/detail/string_concat.hpp>
#include <nlohmann/detail/string_escape.hpp> #include <ostd/vendor/nlohmann/detail/string_escape.hpp>
#include <nlohmann/detail/string_utils.hpp> #include <ostd/vendor/nlohmann/detail/string_utils.hpp>
#include <nlohmann/detail/meta/cpp_future.hpp> #include <ostd/vendor/nlohmann/detail/meta/cpp_future.hpp>
#include <nlohmann/detail/meta/type_traits.hpp> #include <ostd/vendor/nlohmann/detail/meta/type_traits.hpp>
#include <nlohmann/detail/output/binary_writer.hpp> #include <ostd/vendor/nlohmann/detail/output/binary_writer.hpp>
#include <nlohmann/detail/output/output_adapters.hpp> #include <ostd/vendor/nlohmann/detail/output/output_adapters.hpp>
#include <nlohmann/detail/output/serializer.hpp> #include <ostd/vendor/nlohmann/detail/output/serializer.hpp>
#include <nlohmann/detail/value_t.hpp> #include <ostd/vendor/nlohmann/detail/value_t.hpp>
#include <nlohmann/json_fwd.hpp> #include <ostd/vendor/nlohmann/json_fwd.hpp>
#include <nlohmann/ordered_map.hpp> #include <ostd/vendor/nlohmann/ordered_map.hpp>
#if defined(JSON_HAS_CPP_17) #if defined(JSON_HAS_CPP_17)
#if JSON_HAS_STATIC_RTTI #if JSON_HAS_STATIC_RTTI
@ -5301,6 +5301,6 @@ inline void swap(nlohmann::NLOHMANN_BASIC_JSON_TPL& j1, nlohmann::NLOHMANN_BASIC
#endif #endif
#endif #endif
#include <nlohmann/detail/macro_unscope.hpp> #include <ostd/vendor/nlohmann/detail/macro_unscope.hpp>
#endif // INCLUDE_NLOHMANN_JSON_HPP_ #endif // INCLUDE_NLOHMANN_JSON_HPP_

2
src/ostd/vendor/nlohmann/json_fwd.hpp vendored
View file

@ -15,7 +15,7 @@
#include <string> // string #include <string> // string
#include <vector> // vector #include <vector> // vector
#include <nlohmann/detail/abi_macros.hpp> #include <ostd/vendor/nlohmann/detail/abi_macros.hpp>
/*! /*!
@brief namespace for Niels Lohmann @brief namespace for Niels Lohmann

4
src/ostd/vendor/nlohmann/ordered_map.hpp vendored
View file

@ -17,8 +17,8 @@
#include <utility> // pair #include <utility> // pair
#include <vector> // vector #include <vector> // vector
#include <nlohmann/detail/macro_scope.hpp> #include <ostd/vendor/nlohmann/detail/macro_scope.hpp>
#include <nlohmann/detail/meta/type_traits.hpp> #include <ostd/vendor/nlohmann/detail/meta/type_traits.hpp>
NLOHMANN_JSON_NAMESPACE_BEGIN NLOHMANN_JSON_NAMESPACE_BEGIN