From d3015b4e3601abdac0e3c49e51ed40a6767fd364 Mon Sep 17 00:00:00 2001 From: Juan Cruz Viotti Date: Tue, 15 Oct 2024 14:30:48 -0400 Subject: [PATCH] Bump JSON Toolkit to the latest version Signed-off-by: Juan Cruz Viotti --- DEPENDENCIES | 2 +- src/compiler/include/sourcemeta/blaze/compiler_error.h | 7 +++++++ vendor/jsontoolkit/cmake/FindGoogleBenchmark.cmake | 4 ++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/DEPENDENCIES b/DEPENDENCIES index c792c357..1335b4f7 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -1,6 +1,6 @@ vendorpull https://github.com/sourcemeta/vendorpull dea311b5bfb53b6926a4140267959ae334d3ecf4 noa https://github.com/sourcemeta/noa 837e1ff981f8df45d9e2977a50f5da61d8affed4 -jsontoolkit https://github.com/sourcemeta/jsontoolkit b19c02084362aff20b2517b1b2cd0fe80acc2382 +jsontoolkit https://github.com/sourcemeta/jsontoolkit 9685d29e2e633d71319c64b1ab2fbceab865dbf3 googletest https://github.com/google/googletest a7f443b80b105f940225332ed3c31f2790092f47 googlebenchmark https://github.com/google/benchmark 378fe693a1ef51500db21b11ff05a8018c5f0e55 jsonschema-test-suite https://github.com/json-schema-org/JSON-Schema-Test-Suite c2badb1298a8698f86dadf1aea7b44b3a894e5ac diff --git a/src/compiler/include/sourcemeta/blaze/compiler_error.h b/src/compiler/include/sourcemeta/blaze/compiler_error.h index 68cf5a71..b83f1ce1 100644 --- a/src/compiler/include/sourcemeta/blaze/compiler_error.h +++ b/src/compiler/include/sourcemeta/blaze/compiler_error.h @@ -14,6 +14,13 @@ namespace sourcemeta::blaze { +// Exporting symbols that depends on the standard C++ library is considered +// safe. +// https://learn.microsoft.com/en-us/cpp/error-messages/compiler-warnings/compiler-warning-level-2-c4275?view=msvc-170&redirectedfrom=MSDN +#if defined(_MSC_VER) +#pragma warning(disable : 4251 4275) +#endif + /// @ingroup jsonschema /// An error that represents a schema compilation failure event class SOURCEMETA_BLAZE_COMPILER_EXPORT SchemaCompilationError diff --git a/vendor/jsontoolkit/cmake/FindGoogleBenchmark.cmake b/vendor/jsontoolkit/cmake/FindGoogleBenchmark.cmake index 1ae1b8af..da442f63 100644 --- a/vendor/jsontoolkit/cmake/FindGoogleBenchmark.cmake +++ b/vendor/jsontoolkit/cmake/FindGoogleBenchmark.cmake @@ -1,5 +1,5 @@ -if(NOT Benchnark_FOUND) +if(NOT Benchmark_FOUND) set(BENCHMARK_ENABLE_TESTING OFF CACHE BOOL "Enable testing of the benchmark library.") add_subdirectory("${PROJECT_SOURCE_DIR}/vendor/googlebenchmark") - set(Benchnark_FOUND ON) + set(Benchmark_FOUND ON) endif()