| author | Niveditha Rau <Niveditha.Rau@Oracle.COM> |
| Fri, 05 Aug 2016 09:36:11 +0000 | |
| changeset 6583 | d6703a724425 |
| permissions | -rw-r--r-- |
|
6583
d6703a724425
24400179 libtorrent/rtorrent needs to be updated to work with an updated sigcpp
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
1 |
Changes for successful compilation on Solaris. |
|
d6703a724425
24400179 libtorrent/rtorrent needs to be updated to work with an updated sigcpp
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
2 |
|
|
d6703a724425
24400179 libtorrent/rtorrent needs to be updated to work with an updated sigcpp
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
3 |
Evaluate to possibly send upstream |
|
d6703a724425
24400179 libtorrent/rtorrent needs to be updated to work with an updated sigcpp
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
4 |
|
|
d6703a724425
24400179 libtorrent/rtorrent needs to be updated to work with an updated sigcpp
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
5 |
|
|
d6703a724425
24400179 libtorrent/rtorrent needs to be updated to work with an updated sigcpp
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
6 |
--- libtorrent-0.12.2/src/dht/dht_hash_map.h 2016-07-21 14:25:16.783986236 -0700 |
|
d6703a724425
24400179 libtorrent/rtorrent needs to be updated to work with an updated sigcpp
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
7 |
+++ libtorrent-0.12.2/src/dht/dht_hash_map.h 2016-07-21 14:25:27.729767142 -0700 |
|
d6703a724425
24400179 libtorrent/rtorrent needs to be updated to work with an updated sigcpp
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
8 |
@@ -167,7 +167,7 @@ |
|
d6703a724425
24400179 libtorrent/rtorrent needs to be updated to work with an updated sigcpp
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
9 |
|
|
d6703a724425
24400179 libtorrent/rtorrent needs to be updated to work with an updated sigcpp
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
10 |
inline |
|
d6703a724425
24400179 libtorrent/rtorrent needs to be updated to work with an updated sigcpp
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
11 |
DhtNode* DhtNodeList::add_node(DhtNode* n) {
|
|
d6703a724425
24400179 libtorrent/rtorrent needs to be updated to work with an updated sigcpp
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
12 |
- insert(std::make_pair<const HashString*, DhtNode*>(n, n)); |
|
d6703a724425
24400179 libtorrent/rtorrent needs to be updated to work with an updated sigcpp
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
13 |
+ insert(std::pair<const HashString*, DhtNode*>(n, n)); |
|
d6703a724425
24400179 libtorrent/rtorrent needs to be updated to work with an updated sigcpp
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
14 |
return n; |
|
d6703a724425
24400179 libtorrent/rtorrent needs to be updated to work with an updated sigcpp
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
15 |
} |
|
d6703a724425
24400179 libtorrent/rtorrent needs to be updated to work with an updated sigcpp
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
16 |
|
|
d6703a724425
24400179 libtorrent/rtorrent needs to be updated to work with an updated sigcpp
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
17 |
--- libtorrent-0.12.2/src/torrent/data/block.h 2008-05-07 05:19:13.000000000 -0700 |
|
d6703a724425
24400179 libtorrent/rtorrent needs to be updated to work with an updated sigcpp
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
18 |
+++ libtorrent-0.12.2/src/torrent/data/block.h 2016-07-21 14:22:47.000352058 -0700 |
|
d6703a724425
24400179 libtorrent/rtorrent needs to be updated to work with an updated sigcpp
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
19 |
@@ -37,6 +37,7 @@ |
|
d6703a724425
24400179 libtorrent/rtorrent needs to be updated to work with an updated sigcpp
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
20 |
#ifndef LIBTORRENT_BLOCK_H |
|
d6703a724425
24400179 libtorrent/rtorrent needs to be updated to work with an updated sigcpp
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
21 |
#define LIBTORRENT_BLOCK_H |
|
d6703a724425
24400179 libtorrent/rtorrent needs to be updated to work with an updated sigcpp
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
22 |
|
|
d6703a724425
24400179 libtorrent/rtorrent needs to be updated to work with an updated sigcpp
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
23 |
+#include <cstring> |
|
d6703a724425
24400179 libtorrent/rtorrent needs to be updated to work with an updated sigcpp
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
24 |
#include <vector> |
|
d6703a724425
24400179 libtorrent/rtorrent needs to be updated to work with an updated sigcpp
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
25 |
#include <torrent/common.h> |
|
d6703a724425
24400179 libtorrent/rtorrent needs to be updated to work with an updated sigcpp
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
26 |
#include <torrent/data/block_transfer.h> |
|
d6703a724425
24400179 libtorrent/rtorrent needs to be updated to work with an updated sigcpp
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
27 |
--- libtorrent-0.12.2/src/torrent/exceptions.cc 2016-07-21 14:32:05.972670769 -0700 |
|
d6703a724425
24400179 libtorrent/rtorrent needs to be updated to work with an updated sigcpp
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
28 |
+++ libtorrent-0.12.2/src/torrent/exceptions.cc 2016-07-21 14:32:23.871378484 -0700 |
|
d6703a724425
24400179 libtorrent/rtorrent needs to be updated to work with an updated sigcpp
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
29 |
@@ -37,6 +37,7 @@ |
|
d6703a724425
24400179 libtorrent/rtorrent needs to be updated to work with an updated sigcpp
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
30 |
#include "config.h" |
|
d6703a724425
24400179 libtorrent/rtorrent needs to be updated to work with an updated sigcpp
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
31 |
|
|
d6703a724425
24400179 libtorrent/rtorrent needs to be updated to work with an updated sigcpp
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
32 |
#include <cerrno> |
|
d6703a724425
24400179 libtorrent/rtorrent needs to be updated to work with an updated sigcpp
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
33 |
+#include <cstring> |
|
d6703a724425
24400179 libtorrent/rtorrent needs to be updated to work with an updated sigcpp
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
34 |
|
|
d6703a724425
24400179 libtorrent/rtorrent needs to be updated to work with an updated sigcpp
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
35 |
#include "exceptions.h" |
|
d6703a724425
24400179 libtorrent/rtorrent needs to be updated to work with an updated sigcpp
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
36 |
|
|
d6703a724425
24400179 libtorrent/rtorrent needs to be updated to work with an updated sigcpp
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
37 |
--- libtorrent-0.12.2/src/torrent/object_stream.cc 2016-07-21 14:34:49.458499366 -0700 |
|
d6703a724425
24400179 libtorrent/rtorrent needs to be updated to work with an updated sigcpp
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
38 |
+++ libtorrent-0.12.2/src/torrent/object_stream.cc 2016-07-21 14:35:46.590821537 -0700 |
|
d6703a724425
24400179 libtorrent/rtorrent needs to be updated to work with an updated sigcpp
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
39 |
@@ -38,6 +38,7 @@ |
|
d6703a724425
24400179 libtorrent/rtorrent needs to be updated to work with an updated sigcpp
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
40 |
|
|
d6703a724425
24400179 libtorrent/rtorrent needs to be updated to work with an updated sigcpp
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
41 |
#include <iterator> |
|
d6703a724425
24400179 libtorrent/rtorrent needs to be updated to work with an updated sigcpp
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
42 |
#include <iostream> |
|
d6703a724425
24400179 libtorrent/rtorrent needs to be updated to work with an updated sigcpp
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
43 |
+#include <cstring> |
|
d6703a724425
24400179 libtorrent/rtorrent needs to be updated to work with an updated sigcpp
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
44 |
#include <rak/functional.h> |
|
d6703a724425
24400179 libtorrent/rtorrent needs to be updated to work with an updated sigcpp
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
45 |
#include <rak/algorithm.h> |
|
d6703a724425
24400179 libtorrent/rtorrent needs to be updated to work with an updated sigcpp
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
46 |
|
|
d6703a724425
24400179 libtorrent/rtorrent needs to be updated to work with an updated sigcpp
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
47 |
--- libtorrent-0.12.2/src/data/chunk.cc 2016-07-21 14:36:43.901801737 -0700 |
|
d6703a724425
24400179 libtorrent/rtorrent needs to be updated to work with an updated sigcpp
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
48 |
+++ libtorrent-0.12.2/src/data/chunk.cc 2016-07-21 14:37:40.676713436 -0700 |
|
d6703a724425
24400179 libtorrent/rtorrent needs to be updated to work with an updated sigcpp
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
49 |
@@ -38,6 +38,7 @@ |
|
d6703a724425
24400179 libtorrent/rtorrent needs to be updated to work with an updated sigcpp
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
50 |
|
|
d6703a724425
24400179 libtorrent/rtorrent needs to be updated to work with an updated sigcpp
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
51 |
#include <algorithm> |
|
d6703a724425
24400179 libtorrent/rtorrent needs to be updated to work with an updated sigcpp
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
52 |
#include <functional> |
|
d6703a724425
24400179 libtorrent/rtorrent needs to be updated to work with an updated sigcpp
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
53 |
+#include <cstring> |
|
d6703a724425
24400179 libtorrent/rtorrent needs to be updated to work with an updated sigcpp
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
54 |
|
|
d6703a724425
24400179 libtorrent/rtorrent needs to be updated to work with an updated sigcpp
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
55 |
#include "torrent/exceptions.h" |
|
d6703a724425
24400179 libtorrent/rtorrent needs to be updated to work with an updated sigcpp
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
56 |
|
|
d6703a724425
24400179 libtorrent/rtorrent needs to be updated to work with an updated sigcpp
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
57 |
--- libtorrent-0.12.2/src/utils/diffie_hellman.cc 2016-07-21 14:41:11.573426007 -0700 |
|
d6703a724425
24400179 libtorrent/rtorrent needs to be updated to work with an updated sigcpp
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
58 |
+++ libtorrent-0.12.2/src/utils/diffie_hellman.cc 2016-07-21 14:41:26.800532608 -0700 |
|
d6703a724425
24400179 libtorrent/rtorrent needs to be updated to work with an updated sigcpp
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
59 |
@@ -37,6 +37,7 @@ |
|
d6703a724425
24400179 libtorrent/rtorrent needs to be updated to work with an updated sigcpp
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
60 |
#include "config.h" |
|
d6703a724425
24400179 libtorrent/rtorrent needs to be updated to work with an updated sigcpp
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
61 |
|
|
d6703a724425
24400179 libtorrent/rtorrent needs to be updated to work with an updated sigcpp
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
62 |
#include <string> |
|
d6703a724425
24400179 libtorrent/rtorrent needs to be updated to work with an updated sigcpp
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
63 |
+#include <cstring> |
|
d6703a724425
24400179 libtorrent/rtorrent needs to be updated to work with an updated sigcpp
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
64 |
|
|
d6703a724425
24400179 libtorrent/rtorrent needs to be updated to work with an updated sigcpp
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
65 |
#ifdef USE_OPENSSL |
|
d6703a724425
24400179 libtorrent/rtorrent needs to be updated to work with an updated sigcpp
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
66 |
#include <openssl/bn.h> |