Forget one std::FILE

c1c85b02 · Jonathan Dumaresq · 635a4fc3 · c1c85b02 · c1c85b02
Commit c1c85b02 authored Dec 14, 2018 by Jonathan Dumaresq
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

input_adapters.hpp include/nlohmann/detail/input/input_adapters.hpp +1 -1

json.hpp single_include/nlohmann/json.hpp +1 -1

No files found.
--- 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>(file)) {}
    /// input adapter for input stream
    input_adapter(std::istream& i)

--- 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>(file)) {}
    /// input adapter for input stream
    input_adapter(std::istream& i)