You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by ns...@apache.org on 2016/03/02 15:45:08 UTC
[6/8] thrift git commit: THRIFT-3693 Fix include issue in C++
TSSLSocketInterruptTest on Windows
THRIFT-3693 Fix include issue in C++ TSSLSocketInterruptTest on Windows
This closes #910
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/327d1345
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/327d1345
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/327d1345
Branch: refs/heads/master
Commit: 327d1345b6ef7a12c729891f2fef750bdfa8a82b
Parents: 06e8fd4
Author: Nobuaki Sukegawa <ns...@apache.org>
Authored: Sun Feb 28 12:44:02 2016 +0900
Committer: Nobuaki Sukegawa <ns...@apache.org>
Committed: Wed Mar 2 23:44:23 2016 +0900
----------------------------------------------------------------------
lib/cpp/src/thrift/transport/TSSLSocket.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/327d1345/lib/cpp/src/thrift/transport/TSSLSocket.h
----------------------------------------------------------------------
diff --git a/lib/cpp/src/thrift/transport/TSSLSocket.h b/lib/cpp/src/thrift/transport/TSSLSocket.h
index ba8abf4..03157d7 100644
--- a/lib/cpp/src/thrift/transport/TSSLSocket.h
+++ b/lib/cpp/src/thrift/transport/TSSLSocket.h
@@ -20,11 +20,12 @@
#ifndef _THRIFT_TRANSPORT_TSSLSOCKET_H_
#define _THRIFT_TRANSPORT_TSSLSOCKET_H_ 1
+// Put this first to avoid WIN32 build failure
+#include <thrift/transport/TSocket.h>
#include <string>
#include <boost/shared_ptr.hpp>
#include <openssl/ssl.h>
#include <thrift/concurrency/Mutex.h>
-#include <thrift/transport/TSocket.h>
namespace apache {
namespace thrift {