From c1c85b025ca3f8619ba80c6c26ca1b52f282f3bb Mon Sep 17 00:00:00 2001 From: Jonathan Dumaresq Date: Fri, 14 Dec 2018 07:33:28 -0500 Subject: [PATCH] Forget one std::FILE --- include/nlohmann/detail/input/input_adapters.hpp | 2 +- single_include/nlohmann/json.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/nlohmann/detail/input/input_adapters.hpp b/include/nlohmann/detail/input/input_adapters.hpp index 3c097a6a..aaf9ebc5 100644 --- a/include/nlohmann/detail/input/input_adapters.hpp +++ b/include/nlohmann/detail/input/input_adapters.hpp @@ -309,7 +309,7 @@ class input_adapter { public: // native support - input_adapter(FILE* file) + input_adapter(std::FILE* file) : ia(std::make_shared(file)) {} /// input adapter for input stream input_adapter(std::istream& i) diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index 781d6f14..f1dd9bea 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -2358,7 +2358,7 @@ class input_adapter { public: // native support - input_adapter(FILE* file) + input_adapter(std::FILE* file) : ia(std::make_shared(file)) {} /// input adapter for input stream input_adapter(std::istream& i)