mirror of https://github.com/aria2/aria2
- pulling in std::back_insterter under MSVC
- MSVC needs a return value even with unreachable codepull/2045/head
parent
18fdffdf17
commit
461f9abcc9
|
@ -97,7 +97,7 @@ KqueueEventPoll::KqueueEventPoll()
|
||||||
KqueueEventPoll::~KqueueEventPoll()
|
KqueueEventPoll::~KqueueEventPoll()
|
||||||
{
|
{
|
||||||
if (kqfd_ != -1) {
|
if (kqfd_ != -1) {
|
||||||
int r = close(kqfd_);
|
int r = a2_close(kqfd_);
|
||||||
int errNum = errno;
|
int errNum = errno;
|
||||||
if (r == -1) {
|
if (r == -1) {
|
||||||
A2_LOG_ERROR(fmt("Error occurred while closing kqueue file descriptor"
|
A2_LOG_ERROR(fmt("Error occurred while closing kqueue file descriptor"
|
||||||
|
|
|
@ -32,6 +32,11 @@
|
||||||
* files in the program, then also delete it here.
|
* files in the program, then also delete it here.
|
||||||
*/
|
*/
|
||||||
/* copyright --> */
|
/* copyright --> */
|
||||||
|
|
||||||
|
#if defined(_MSC_VER) // for std::back_inserter
|
||||||
|
# include <iterator>
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "ReceiverMSEHandshakeCommand.h"
|
#include "ReceiverMSEHandshakeCommand.h"
|
||||||
#include "PeerReceiveHandshakeCommand.h"
|
#include "PeerReceiveHandshakeCommand.h"
|
||||||
#include "PeerConnection.h"
|
#include "PeerConnection.h"
|
||||||
|
|
|
@ -41,6 +41,10 @@
|
||||||
#include <deque>
|
#include <deque>
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
|
|
||||||
|
#if defined(_MSC_VER) // for std::back_inserter
|
||||||
|
# include <iterator>
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "RpcRequest.h"
|
#include "RpcRequest.h"
|
||||||
#include "ValueBase.h"
|
#include "ValueBase.h"
|
||||||
#include "TorrentAttribute.h"
|
#include "TorrentAttribute.h"
|
||||||
|
|
|
@ -145,6 +145,7 @@ ssize_t SSHSession::writeData(const void* data, size_t len)
|
||||||
{
|
{
|
||||||
// net implemented yet
|
// net implemented yet
|
||||||
assert(0);
|
assert(0);
|
||||||
|
return 0; // MSVC needs a return value even if it's unreached
|
||||||
}
|
}
|
||||||
|
|
||||||
ssize_t SSHSession::readData(void* data, size_t len)
|
ssize_t SSHSession::readData(void* data, size_t len)
|
||||||
|
|
Loading…
Reference in New Issue