boostorg/beast
1
0
Fork 1
mirror of https://github.com/boostorg/beast.git synced 2025-08-05 15:54:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

Tidy up file_stdio for VS2015

Browse Source
This commit is contained in:
Vinnie Falco
2019-03-30 14:13:36 -07:00
parent 24ccdd243a
commit 4f464ccaeb
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -1,6 +1,7 @@
Version 243: Version 243:
* Fix some typos * Fix some typos
* Tidy up file_stdio for VS2015
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------

10
include/boost/beast/core/impl/file_stdio.ipp
View File

@@ -104,13 +104,21 @@ open(char const* path, file_mode mode, error_code& ec)
#if BOOST_WORKAROUND(BOOST_MSVC, < 1910) #if BOOST_WORKAROUND(BOOST_MSVC, < 1910)
FILE* f0; FILE* f0;
auto const ev = ::fopen_s(&f0, path, "rb"); auto const ev = ::fopen_s(&f0, path, "rb");
if(ev) if(! ev)
{
std::fclose(f0);
ec = make_error_code(errc::file_exists);
return;
}
else if(ev !=
errc::no_such_file_or_directory)
{ {
ec.assign(ev, generic_category()); ec.assign(ev, generic_category());
return; return;
} }
s = "wb"; s = "wb";
#else #else
s = "wbx"; s = "wbx";
#endif #endif
break; break;

2
test/beast/core/file_test.hpp
View File

@@ -163,7 +163,7 @@ test_file()
error_code ec; error_code ec;
BEAST_EXPECT(! fs::exists(path)); BEAST_EXPECT(! fs::exists(path));
f.open(path, file_mode::write_new, ec); f.open(path, file_mode::write_new, ec);
BEAST_EXPECT(! ec); BEAST_EXPECTS(! ec, ec.message());
BEAST_EXPECT(fs::exists(path)); BEAST_EXPECT(fs::exists(path));
} }
{ {