From fec680f98c44d5b98b440e4f63b5db8426f5c896 Mon Sep 17 00:00:00 2001 From: "Dr. Colin Hirsch" Date: Sun, 17 Sep 2023 21:25:13 +0200 Subject: [PATCH] Update taoJSON (and PEGTL). --- external/json | 2 +- include/tao/config/internal/json_base.hpp | 2 +- include/tao/config/internal/system_utility.hpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/external/json b/external/json index cb58021..2652d82 160000 --- a/external/json +++ b/external/json @@ -1 +1 @@ -Subproject commit cb58021b519a57c9d969c0e8bc3a179fe4811f0f +Subproject commit 2652d82e7728fd26a14896cc37e16559c41d198b diff --git a/include/tao/config/internal/json_base.hpp b/include/tao/config/internal/json_base.hpp index d92b3d4..618545c 100644 --- a/include/tao/config/internal/json_base.hpp +++ b/include/tao/config/internal/json_base.hpp @@ -16,7 +16,7 @@ namespace tao::config::internal pegtl::position position; json_base() - : position( pegtl::internal::iterator{ nullptr, 1, 1, 1 }, "TODO: Delete the default c'tor!" ) + : position( pegtl::internal::frobnicator{ nullptr, 1, 1, 1 }, "TODO: Delete the default c'tor!" ) {} // json_base() = delete; diff --git a/include/tao/config/internal/system_utility.hpp b/include/tao/config/internal/system_utility.hpp index f32314e..b2c28f8 100644 --- a/include/tao/config/internal/system_utility.hpp +++ b/include/tao/config/internal/system_utility.hpp @@ -20,7 +20,7 @@ namespace tao::config::internal [[nodiscard]] inline std::string read_file_throws( const std::string& filename ) { - return pegtl::internal::file_reader( filename ).read(); + return pegtl::internal::read_file_stdio( filename ).read_string(); } [[nodiscard]] inline std::optional< std::string > read_file_nothrow( const std::string& filename )