Forget one std::FILE

dumarjo · dumarjo · commit c1c85b025ca3 · 2018-12-14T07:33:28.000-05:00
diff --git 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)
diff --git 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)

Original file line number	Diff line number	Diff line change
`@@ -309,7 +309,7 @@ class input_adapter`
`309`	`309`	`{`
`310`	`310`	`public:`
`311`	`311`	`// native support`
`312`		`- input_adapter(FILE* file)`
	`312`	`+ input_adapter(std::FILE* file)`
`313`	`313`	`: ia(std::make_shared<file_input_adapter>(file)) {}`
`314`	`314`	`/// input adapter for input stream`
`315`	`315`	`input_adapter(std::istream& i)`
Original file line number	Diff line number	Diff line change
`@@ -2358,7 +2358,7 @@ class input_adapter`
`2358`	`2358`	`{`
`2359`	`2359`	`public:`
`2360`	`2360`	`// native support`
`2361`		`- input_adapter(FILE* file)`
	`2361`	`+ input_adapter(std::FILE* file)`
`2362`	`2362`	`: ia(std::make_shared<file_input_adapter>(file)) {}`
`2363`	`2363`	`/// input adapter for input stream`
`2364`	`2364`	`input_adapter(std::istream& i)`