C++11 compatibility fixes.

This commit is contained in:
rakshasa
2014-05-13 23:36:37 +09:00
parent e42ec54920
commit 3b39f37f49
77 changed files with 886 additions and 803 deletions
+3 -3
View File
@@ -38,15 +38,15 @@
#define RTORRENT_INPUT_BINDINGS_H
#include <map>
#include <tr1/functional>
#include lt_tr1_functional
#include "display/attributes.h"
namespace input {
class Bindings : private std::map<int, std::tr1::function<void ()> > {
class Bindings : private std::map<int, std::function<void ()> > {
public:
typedef std::tr1::function<void ()> slot_void;
typedef std::function<void ()> slot_void;
typedef std::map<int, slot_void> base_type;
using base_type::iterator;
+2 -2
View File
@@ -39,13 +39,13 @@
#include <torrent/event.h>
#include <torrent/poll.h>
#include <tr1/functional>
#include lt_tr1_functional
namespace input {
class InputEvent : public torrent::Event {
public:
typedef std::tr1::function<void (int)> slot_int;
typedef std::function<void (int)> slot_int;
InputEvent(int fd) { m_fileDesc = fd; }
+3 -3
View File
@@ -38,7 +38,7 @@
#define RTORRENT_INPUT_PATH_INPUT_H
#include <list>
#include <tr1/functional>
#include lt_tr1_functional
#include "utils/directory.h"
#include "text_input.h"
@@ -50,8 +50,8 @@ public:
typedef utils::Directory::iterator directory_itr;
typedef std::pair<directory_itr, directory_itr> range_type;
typedef std::tr1::function<void ()> slot_void;
typedef std::tr1::function<void (directory_itr, directory_itr)> slot_itr_itr;
typedef std::function<void ()> slot_void;
typedef std::function<void (directory_itr, directory_itr)> slot_itr_itr;
typedef std::list<slot_void> signal_void;
typedef std::list<slot_itr_itr> signal_itr_itr;
+1 -1
View File
@@ -46,7 +46,7 @@ namespace input {
class TextInput : private std::string {
public:
typedef std::string Base;
typedef std::tr1::function<void ()> slot_void;
typedef std::function<void ()> slot_void;
using Base::c_str;
using Base::empty;