From 871e439ac182b9b73f2cd79511fa3ce1373d5ccf Mon Sep 17 00:00:00 2001 From: Edward Diener Date: Fri, 3 Apr 2020 08:37:30 -0400 Subject: [PATCH] Fix FILE namespace qualification fixes #1944 --- CHANGELOG.md | 1 + include/boost/beast/core/file_stdio.hpp | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bfd69930..d9f226e3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,4 @@ +* Fix FILE namespace qualification * Fix http read bytes_transferred (API Change) API Changes: diff --git a/include/boost/beast/core/file_stdio.hpp b/include/boost/beast/core/file_stdio.hpp index d56632b8..b01bbf09 100644 --- a/include/boost/beast/core/file_stdio.hpp +++ b/include/boost/beast/core/file_stdio.hpp @@ -26,14 +26,14 @@ namespace beast { */ class file_stdio { - FILE* f_ = nullptr; + std::FILE* f_ = nullptr; public: /** The type of the underlying file handle. This is platform-specific. */ - using native_handle_type = FILE*; + using native_handle_type = std::FILE*; /** Destructor @@ -63,7 +63,7 @@ public: file_stdio& operator=(file_stdio&& other); /// Returns the native handle associated with the file. - FILE* + std::FILE* native_handle() const { return f_; @@ -77,7 +77,7 @@ public: */ BOOST_BEAST_DECL void - native_handle(FILE* f); + native_handle(std::FILE* f); /// Returns `true` if the file is open bool