diff --git a/include/nlohmann/detail/input/string_scan.hpp b/include/nlohmann/detail/input/string_scan.hpp index 11cf405d0..abe39e475 100644 --- a/include/nlohmann/detail/input/string_scan.hpp +++ b/include/nlohmann/detail/input/string_scan.hpp @@ -425,7 +425,7 @@ JSON_HEDLEY_ALWAYS_INLINE std::size_t string_bulk_run(const unsigned char* data, return scalar_string_bulk_run(data, n); } -#if JSON_SCAN_NEON +#if JSON_SCAN_NEON && !(defined(JSON_USE_SIMDUTF) && defined(JSON_HAS_CPP_17)) /// scalar_string_bulk_run() from @a start on, out of line (see /// lexer_string_bulk_run()) JSON_HEDLEY_NEVER_INLINE inline std::size_t string_bulk_run_from(const unsigned char* data, std::size_t start, std::size_t n) noexcept diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index e4df77677..ca00871d1 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -11883,7 +11883,7 @@ JSON_HEDLEY_ALWAYS_INLINE std::size_t string_bulk_run(const unsigned char* data, return scalar_string_bulk_run(data, n); } -#if JSON_SCAN_NEON +#if JSON_SCAN_NEON && !(defined(JSON_USE_SIMDUTF) && defined(JSON_HAS_CPP_17)) /// scalar_string_bulk_run() from @a start on, out of line (see /// lexer_string_bulk_run()) JSON_HEDLEY_NEVER_INLINE inline std::size_t string_bulk_run_from(const unsigned char* data, std::size_t start, std::size_t n) noexcept