boostorg/beast
1
0
Fork 1
mirror of https://github.com/boostorg/beast.git synced 2025-07-31 21:34:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use generic_cateogry for errno

Browse Source
This commit is contained in:
Vinnie Falco
2017-06-17 08:35:09 -07:00
parent cdff15e021
commit a26017d695
4 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -1,6 +1,7 @@
Version 61: Version 61:
* Remove Spirit dependency * Remove Spirit dependency
* Use generic_cateogry for errno
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------

1
doc/quickref.xml
View File

@@ -196,6 +196,7 @@
<member><link linkend="beast.ref.beast__buffer_cat">buffer_cat</link></member> <member><link linkend="beast.ref.beast__buffer_cat">buffer_cat</link></member>
<member><link linkend="beast.ref.beast__buffer_prefix">buffer_prefix</link></member> <member><link linkend="beast.ref.beast__buffer_prefix">buffer_prefix</link></member>
<member><link linkend="beast.ref.beast__buffers">buffers</link></member> <member><link linkend="beast.ref.beast__buffers">buffers</link></member>
<member><link linkend="beast.ref.beast__generic_category">generic_category</link></member>
<member><link linkend="beast.ref.beast__iequals">iequals</link></member> <member><link linkend="beast.ref.beast__iequals">iequals</link></member>
<member><link linkend="beast.ref.beast__ostream">ostream</link></member> <member><link linkend="beast.ref.beast__ostream">ostream</link></member>
<member><link linkend="beast.ref.beast__read_size">read_size</link></member> <member><link linkend="beast.ref.beast__read_size">read_size</link></member>

18
example/server-framework/file_body.hpp
View File

@@ -180,8 +180,8 @@ init(beast::error_code& ec)
if(! file_) if(! file_)
{ {
// Convert the old-school `errno` into // Convert the old-school `errno` into
// an error code using the system category. // an error code using the generic category.
ec = beast::error_code{errno, beast::system_category()}; ec = beast::error_code{errno, beast::generic_category()};
return; return;
} }
@@ -219,8 +219,9 @@ get(beast::error_code& ec) ->
// Handle any errors // Handle any errors
if(ferror(file_)) if(ferror(file_))
{ {
// Convert old-school `errno` to error_code // Convert the old-school `errno` into
ec = beast::error_code(errno, beast::system_category()); // an error code using the generic category.
ec = beast::error_code{errno, beast::generic_category()};
return boost::none; return boost::none;
} }
@@ -350,8 +351,8 @@ init(boost::optional<std::uint64_t> const& content_length, beast::error_code& ec
if(! file_) if(! file_)
{ {
// Convert the old-school `errno` into // Convert the old-school `errno` into
// an error code using the system category. // an error code using the generic category.
ec = beast::error_code{errno, beast::system_category()}; ec = beast::error_code{errno, beast::generic_category()};
return; return;
} }
@@ -379,8 +380,9 @@ put(ConstBufferSequence const& buffers, beast::error_code& ec)
// Handle any errors // Handle any errors
if(ferror(file_)) if(ferror(file_))
{ {
// Convert old-school `errno` to error_code // Convert the old-school `errno` into
ec = beast::error_code(errno, beast::system_category()); // an error code using the generic category.
ec = beast::error_code{errno, beast::generic_category()};
return; return;
} }
} }

8
include/beast/core/error.hpp
View File

@@ -23,6 +23,14 @@ using system_error = boost::system::system_error;
/// The type of error category used by the library /// The type of error category used by the library
using error_category = boost::system::error_category; using error_category = boost::system::error_category;
/// A function to return the generic error category used by the library
#if BEAST_DOXYGEN
error_category const&
generic_category();
#else
using boost::system::generic_category;
#endif
/// A function to return the system error category used by the library /// A function to return the system error category used by the library
#if BEAST_DOXYGEN #if BEAST_DOXYGEN
error_category const& error_category const&