diff --git a/CMakeLists.txt b/CMakeLists.txt index c756364269..1ab27a9a2d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -321,7 +321,7 @@ if(NOT PHASAR_IN_TREE) FetchContent_Declare( googletest GIT_REPOSITORY https://github.com/google/googletest.git - GIT_TAG v1.17.0 + GIT_TAG v1.18.0 ) FetchContent_MakeAvailable(googletest) endif() diff --git a/external/CRoaring b/external/CRoaring index 2e8395f1db..d39b6c4be8 160000 --- a/external/CRoaring +++ b/external/CRoaring @@ -1 +1 @@ -Subproject commit 2e8395f1dbf286d7944a7276195a7c40cbcbfd4a +Subproject commit d39b6c4be88deefc4c4bfc8171571b30902052e9 diff --git a/external/json b/external/json index 55f93686c0..098eebd412 160000 --- a/external/json +++ b/external/json @@ -1 +1 @@ -Subproject commit 55f93686c01528224f448c19128836e7df245f72 +Subproject commit 098eebd412883ccb9d1a26523758e5ec457f58e0 diff --git a/external/json-schema-validator b/external/json-schema-validator index 349cba9f7e..9abddfa905 160000 --- a/external/json-schema-validator +++ b/external/json-schema-validator @@ -1 +1 @@ -Subproject commit 349cba9f7e3cb423bbc1811bdd9f6770f520b468 +Subproject commit 9abddfa905bb4889cc4ae55f87adcaa71dd3bc23 diff --git a/lib/PhasarLLVM/Pointer/LLVMAliasSet.cpp b/lib/PhasarLLVM/Pointer/LLVMAliasSet.cpp index 3974f59d1b..85f99abdfd 100644 --- a/lib/PhasarLLVM/Pointer/LLVMAliasSet.cpp +++ b/lib/PhasarLLVM/Pointer/LLVMAliasSet.cpp @@ -48,6 +48,7 @@ #include #include #include +#include #include namespace psr { diff --git a/lib/Utils/NlohmannLogging.cpp b/lib/Utils/NlohmannLogging.cpp index c990b3d3c7..3db2287761 100644 --- a/lib/Utils/NlohmannLogging.cpp +++ b/lib/Utils/NlohmannLogging.cpp @@ -26,25 +26,19 @@ class LLVMOutputStreamAdapter llvm::raw_ostream &OS; }; -template > -class LLVMOutputAdapter { -public: - template > - - LLVMOutputAdapter(llvm::raw_ostream &OS) - : OA(std::make_unique(OS)) {} - - operator nlohmann::detail::output_adapter_t() { return OA; } - -private: - nlohmann::detail::output_adapter_t OA = nullptr; -}; } // namespace llvm::raw_ostream &operator<<(llvm::raw_ostream &OS, const nlohmann::json &J) { // do the actual serialization - nlohmann::detail::serializer S{LLVMOutputAdapter(OS), ' '}; - S.dump(J, true, false, 4); + LLVMOutputStreamAdapter Adapter(OS); + nlohmann::detail::serializer S{ + Adapter, + /*ichar=*/' ', + /*pretty_print_=*/true, + /*ensure_ascii_=*/false, + /*indent_step_=*/4, + }; + S.dump(J); return OS; }