wornvirtue
/
premiere-libtorrent
forked from premiere/premiere-libtorrent
1
0
Fork 0
Code Pull Requests Activity

merged gcc build fix from RC_0_16

This commit is contained in:
Arvid Norberg 2013-06-21 23:00:34 +00:00
parent 81127c05e0
commit 70ab33d21c
4 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -22,6 +22,7 @@
* fix uTP edge case where udp socket buffer fills up
* fix nagle implementation in uTP
* GCC 4.8 fix
* fix proxy failure semantics with regards to anonymous mode
* fix round-robin seed-unchoke algorithm
* add bootstrap.sh to generage configure script and run configure

2
include/libtorrent/disk_buffer_pool.hpp
View File

@ -33,6 +33,8 @@ POSSIBILITY OF SUCH DAMAGE.
#ifndef TORRENT_DISK_BUFFER_POOL
#define TORRENT_DISK_BUFFER_POOL
#include <boost/utility.hpp>
#include "libtorrent/config.hpp"
#include "libtorrent/thread.hpp"
#include "libtorrent/session_settings.hpp"

12
include/libtorrent/error_code.hpp
View File

@ -329,9 +329,9 @@ namespace libtorrent
struct TORRENT_EXPORT libtorrent_error_category : boost::system::error_category
{
virtual const char* name() const;
virtual std::string message(int ev) const;
virtual boost::system::error_condition default_error_condition(int ev) const
virtual const char* name() const throw();
virtual std::string message(int ev) const throw();
virtual boost::system::error_condition default_error_condition(int ev) const throw()
{ return boost::system::error_condition(ev, *this); }
};
@ -343,9 +343,9 @@ namespace libtorrent
struct TORRENT_EXPORT http_error_category : boost::system::error_category
{
virtual const char* name() const;
virtual std::string message(int ev) const;
virtual boost::system::error_condition default_error_condition(int ev) const
virtual const char* name() const throw();
virtual std::string message(int ev) const throw();
virtual boost::system::error_condition default_error_condition(int ev) const throw()
{ return boost::system::error_condition(ev, *this); }
};

8
src/error_code.cpp
View File

@ -40,12 +40,12 @@ namespace libtorrent
{
#if BOOST_VERSION >= 103500
const char* libtorrent_error_category::name() const
const char* libtorrent_error_category::name() const throw()
{
return "libtorrent error";
}
std::string libtorrent_error_category::message(int ev) const
std::string libtorrent_error_category::message(int ev) const throw()
{
static char const* msgs[] =
{
@ -263,12 +263,12 @@ namespace libtorrent
return msgs[ev];
}
const char* http_error_category::name() const
const char* http_error_category::name() const throw()
{
return "http error";
}
std::string http_error_category::message(int ev) const
std::string http_error_category::message(int ev) const throw()
{
std::string ret;
ret += to_string(ev).elems;