Merge branch 'master' of github.com:simdjson/simdjson

This commit is contained in:
Daniel Lemire 2020-04-22 17:06:10 -04:00
commit 398eda6365
2 changed files with 4 additions and 4 deletions

View File

@ -51,8 +51,8 @@ set(THREADS_PREFER_PTHREAD_FLAG ON)
#
add_library(simdjson-flags INTERFACE)
if(MSVC)
target_compile_options(simdjson-flags INTERFACE /nologo /D_CRT_SECURE_NO_WARNINGS)
target_compile_options(simdjson-flags INTERFACE /WX /W3 /wd4005 /wd4996 /wd4267 /wd4244 /wd4113)
target_compile_options(simdjson-flags INTERFACE /nologo)
target_compile_options(simdjson-flags INTERFACE /WX /W3 /wd4996 /wd4267 /wd4244)
else()
target_compile_options(simdjson-flags INTERFACE -fPIC)
target_compile_options(simdjson-flags INTERFACE -Werror -Wall -Wextra -Wsign-compare -Wshadow -Wwrite-strings -Wpointer-arith -Winit-self)

View File

@ -105,8 +105,8 @@ public:
const size_t len;
const uint32_t* const structural_indexes;
size_t next_structural; // next structural index
size_t idx; // location of the structural character in the input (buf)
uint8_t c; // used to track the (structural) character we are looking at
size_t idx{0}; // location of the structural character in the input (buf)
uint8_t c{0}; // used to track the (structural) character we are looking at
};
struct structural_parser {