From bf398506aab17fcd48406a414e48e07b99297b2b Mon Sep 17 00:00:00 2001 From: Luigi Pinca Date: Fri, 24 Feb 2023 17:44:13 +0100 Subject: [PATCH] [deps] Update is_utf8 to version 1.3.1 --- deps/is_utf8/CMakeLists.txt | 6 +++--- deps/is_utf8/src/is_utf8.cpp | 12 +----------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/deps/is_utf8/CMakeLists.txt b/deps/is_utf8/CMakeLists.txt index 4c5bd50..97c20a7 100644 --- a/deps/is_utf8/CMakeLists.txt +++ b/deps/is_utf8/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.15) project(is_utf8 DESCRIPTION "Fast UTF-8 Validation" LANGUAGES CXX - VERSION 1.3.0 + VERSION 1.3.1 ) include(GNUInstallDirs) @@ -25,8 +25,8 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_EXTENSIONS OFF) set(CMAKE_MACOSX_RPATH OFF) -set(IS_UTF8_LIB_VERSION "1.3.0" CACHE STRING "is_utf8 library version") -set(IS_UTF8_LIB_SOVERSION "2" CACHE STRING "is_utf8 library soversion") +set(IS_UTF8_LIB_VERSION "1.3.1" CACHE STRING "is_utf8 library version") +set(IS_UTF8_LIB_SOVERSION "1" CACHE STRING "is_utf8 library soversion") set(IS_UTF8_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src) add_subdirectory(src) diff --git a/deps/is_utf8/src/is_utf8.cpp b/deps/is_utf8/src/is_utf8.cpp index e6cec38..2a7fe22 100644 --- a/deps/is_utf8/src/is_utf8.cpp +++ b/deps/is_utf8/src/is_utf8.cpp @@ -529,22 +529,12 @@ static inline uint32_t detect_supported_architectures() { return instruction_set::ALTIVEC; } -#elif defined(__arm__) || defined(__aarch64__) // incl. armel, armhf, arm64 - -#if defined(__ARM_NEON) +#elif defined(__aarch64__) || defined(_M_ARM64) static inline uint32_t detect_supported_architectures() { return instruction_set::NEON; } -#else // ARM without NEON - -static inline uint32_t detect_supported_architectures() { - return instruction_set::DEFAULT; -} - -#endif - #elif defined(__x86_64__) || defined(_M_AMD64) // x64 namespace {