-
Notifications
You must be signed in to change notification settings - Fork 54
/
Copy paththrift_uint64t.patch
50 lines (45 loc) · 2 KB
/
thrift_uint64t.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
diff -crN a/third_party/thrift-0.8.0/lib/cpp/src/transport/TSSLSocket.cpp b/third_party/thrift-0.8.0/lib/cpp/src/transport/TSSLSocket.cpp
*** a/third_party/thrift-0.8.0/lib/cpp/src/transport/TSSLSocket.cpp 2011-11-26 19:00:41.000000000 +0000
--- b/third_party/thrift-0.8.0/lib/cpp/src/transport/TSSLSocket.cpp 2014-07-03 06:02:08.187901128 +0000
***************
*** 347,353 ****
// TSSLSocketFactory implementation
bool TSSLSocketFactory::initialized = false;
! uint64_t TSSLSocketFactory::count_ = 0;
Mutex TSSLSocketFactory::mutex_;
TSSLSocketFactory::TSSLSocketFactory(): server_(false) {
--- 347,353 ----
// TSSLSocketFactory implementation
bool TSSLSocketFactory::initialized = false;
! boost::uint64_t TSSLSocketFactory::count_ = 0;
Mutex TSSLSocketFactory::mutex_;
TSSLSocketFactory::TSSLSocketFactory(): server_(false) {
diff -crN a/third_party/thrift-0.8.0/lib/cpp/src/transport/TSSLSocket.h b/third_party/thrift-0.8.0/lib/cpp/src/transport/TSSLSocket.h
*** a/third_party/thrift-0.8.0/lib/cpp/src/transport/TSSLSocket.h 2011-11-26 19:00:41.000000000 +0000
--- b/third_party/thrift-0.8.0/lib/cpp/src/transport/TSSLSocket.h 2014-07-03 06:02:41.030816551 +0000
***************
*** 21,26 ****
--- 21,27 ----
#define _THRIFT_TRANSPORT_TSSLSOCKET_H_ 1
#include <string>
+ #include <boost/cstdint.hpp>
#include <boost/shared_ptr.hpp>
#include <openssl/ssl.h>
#include "concurrency/Mutex.h"
***************
*** 207,213 ****
boost::shared_ptr<AccessManager> access_;
static bool initialized;
static concurrency::Mutex mutex_;
! static uint64_t count_;
void setup(boost::shared_ptr<TSSLSocket> ssl);
static int passwordCallback(char* password, int size, int, void* data);
};
--- 208,214 ----
boost::shared_ptr<AccessManager> access_;
static bool initialized;
static concurrency::Mutex mutex_;
! static boost::uint64_t count_;
void setup(boost::shared_ptr<TSSLSocket> ssl);
static int passwordCallback(char* password, int size, int, void* data);
};