feedc0de/boost_system
1
0
Fork 0
forked from boostorg/system
Code Pull Requests Activity

Updated Boost.WinAPI usage to the new location and namespace.

Browse Source
This commit is contained in:
Andrey Semashev
2017-10-25 00:44:18 +03:00
parent 41e0404847
commit a4b67129ff
3 changed files with 76 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/boost/system/detail/error_code.ipp
+23 -23
View File
@@ -21,9 +21,9 @@
#include <cstring> // for strerror/strerror_r
# if defined( BOOST_WINDOWS_API )
# include <boost/detail/winapi/error_codes.hpp>
# include <boost/detail/winapi/error_handling.hpp>
# include <boost/detail/winapi/character_code_conversion.hpp>
# include <boost/winapi/error_codes.hpp>
# include <boost/winapi/error_handling.hpp>
# include <boost/winapi/character_code_conversion.hpp>
# if !BOOST_PLAT_WINDOWS_RUNTIME
# include <boost/system/detail/local_free_on_destruction.hpp>
# endif
@@ -186,7 +186,7 @@ namespace
# if defined(BOOST_WINDOWS_API)
using namespace boost::detail::winapi; // for error codes
using namespace boost::winapi; // for error codes
# endif
@@ -382,13 +382,13 @@ namespace
std::wstring buf(128, wchar_t());
for (;;)
{
boost::detail::winapi::DWORD_ retval = boost::detail::winapi::FormatMessageW(
boost::detail::winapi::FORMAT_MESSAGE_FROM_SYSTEM_ |
boost::detail::winapi::FORMAT_MESSAGE_IGNORE_INSERTS_,
boost::winapi::DWORD_ retval = boost::winapi::FormatMessageW(
boost::winapi::FORMAT_MESSAGE_FROM_SYSTEM_ |
boost::winapi::FORMAT_MESSAGE_IGNORE_INSERTS_,
NULL,
ev,
boost::detail::winapi::MAKELANGID_(boost::detail::winapi::LANG_NEUTRAL_,
boost::detail::winapi::SUBLANG_DEFAULT_), // Default language
boost::winapi::MAKELANGID_(boost::winapi::LANG_NEUTRAL_,
boost::winapi::SUBLANG_DEFAULT_), // Default language
&buf[0],
static_cast<DWORD>(buf.size()),
NULL
@@ -399,8 +399,8 @@ namespace
buf.resize(retval);
break;
}
else if (boost::detail::winapi::GetLastError() !=
boost::detail::winapi::ERROR_INSUFFICIENT_BUFFER_)
else if (boost::winapi::GetLastError() !=
boost::winapi::ERROR_INSUFFICIENT_BUFFER_)
{
return std::string("Unknown error");
}
@@ -411,9 +411,9 @@ namespace
}
int num_chars = (buf.size() + 1) * 2;
boost::detail::winapi::LPSTR_ narrow_buffer =
(boost::detail::winapi::LPSTR_)_alloca(num_chars);
if (boost::detail::winapi::WideCharToMultiByte(boost::detail::winapi::CP_ACP_, 0,
boost::winapi::LPSTR_ narrow_buffer =
(boost::winapi::LPSTR_)_alloca(num_chars);
if (boost::winapi::WideCharToMultiByte(boost::winapi::CP_ACP_, 0,
buf.c_str(), -1, narrow_buffer, num_chars, NULL, NULL) == 0)
{
return std::string("Unknown error");
@@ -421,16 +421,16 @@ namespace
std::string str( narrow_buffer );
#else
boost::detail::winapi::LPVOID_ lpMsgBuf = 0;
boost::detail::winapi::DWORD_ retval = boost::detail::winapi::FormatMessageA(
boost::detail::winapi::FORMAT_MESSAGE_ALLOCATE_BUFFER_ |
boost::detail::winapi::FORMAT_MESSAGE_FROM_SYSTEM_ |
boost::detail::winapi::FORMAT_MESSAGE_IGNORE_INSERTS_,
boost::winapi::LPVOID_ lpMsgBuf = 0;
boost::winapi::DWORD_ retval = boost::winapi::FormatMessageA(
boost::winapi::FORMAT_MESSAGE_ALLOCATE_BUFFER_ |
boost::winapi::FORMAT_MESSAGE_FROM_SYSTEM_ |
boost::winapi::FORMAT_MESSAGE_IGNORE_INSERTS_,
NULL,
ev,
boost::detail::winapi::MAKELANGID_(boost::detail::winapi::LANG_NEUTRAL_,
boost::detail::winapi::SUBLANG_DEFAULT_), // Default language
(boost::detail::winapi::LPSTR_) &lpMsgBuf,
boost::winapi::MAKELANGID_(boost::winapi::LANG_NEUTRAL_,
boost::winapi::SUBLANG_DEFAULT_), // Default language
(boost::winapi::LPSTR_) &lpMsgBuf,
0,
NULL
);
@@ -438,7 +438,7 @@ namespace
if (retval == 0)
return std::string("Unknown error");
std::string str(static_cast<boost::detail::winapi::LPCSTR_>(lpMsgBuf));
std::string str(static_cast<boost::winapi::LPCSTR_>(lpMsgBuf));
# endif
while ( str.size()
&& (str[str.size()-1] == '\n' || str[str.size()-1] == '\r') )