merge build fix with C++11 from RC_0_16

This commit is contained in:
Arvid Norberg
2013-09-25 19:44:29 +00:00
parent 7ce6425534
commit 89c3db477d
24 changed files with 56 additions and 51 deletions

View File

@@ -48,12 +48,12 @@ namespace libtorrent
i2p_error_category i2p_category;
const char* i2p_error_category::name() const
const char* i2p_error_category::name() const BOOST_SYSTEM_NOEXCEPT
{
return "i2p error";
}
std::string i2p_error_category::message(int ev) const
std::string i2p_error_category::message(int ev) const BOOST_SYSTEM_NOEXCEPT
{
static char const* messages[] =
{