commit 23d6746079d7b5fdb38214387c63f987e68a6d8f
author Jens Geyer <jensg@apache.org> Sat Dec 19 11:44:57 2015 +0100
committer Jens Geyer <jensg@apache.org> Sat Dec 19 11:45:34 2015 +0100
tree 648c9c3e471aa99e5bdffcdadf17bdf568e52735
parent 7be41c7ada9692e3c37fb8b4935991f6247320f6

THRIFT-3487 Full support for newer Delphi versions
Client: Delphi
Patch: Jens Geyer

Contains:
- fix for FStream.Seek() now expecting an UInt64 instead of Int64
- workaround to (temporarily) exclude socket support from newer versions - THIS NEEDS TO BE ADDRESSED!

lib/delphi/src/Thrift.Transport.pas

diff --git a/lib/delphi/src/Thrift.Transport.pas b/lib/delphi/src/Thrift.Transport.pas
index c485e70..74afb52 100644
--- a/lib/delphi/src/Thrift.Transport.pas
+++ b/lib/delphi/src/Thrift.Transport.pas
@@ -19,6 +19,11 @@
 
  {$SCOPEDENUMS ON}
 
+{$IF CompilerVersion < 28.0}
+  {$DEFINE OLD_SOCKETS}   // TODO: add socket support for CompilerVersion >= 28.0
+{$IFEND}
+
+
 unit Thrift.Transport;
 
 interface
@@ -27,7 +32,10 @@
   Classes,
   SysUtils,
   Math,
-  Sockets, WinSock,
+  WinSock,
+  {$IFDEF OLD_SOCKETS}
+  Sockets,
+  {$ENDIF}
   Generics.Collections,
   Thrift.Collections,
   Thrift.Utils,
@@ -151,6 +159,7 @@
     function GetTransport( const ATrans: ITransport): ITransport; virtual;
   end;
 
+  {$IFDEF OLD_SOCKETS}
   TTcpSocketStreamImpl = class( TThriftStreamImpl )
   private type
     TWaitForData = ( wfd_HaveData, wfd_Timeout, wfd_Error);
@@ -173,6 +182,7 @@
   public
     constructor Create( const ATcpClient: TCustomIpClient; const aTimeout : Integer = 0);
   end;
+  {$ENDIF}
 
   IStreamTransport = interface( ITransport )
     ['{A8479B47-2A3E-4421-A9A0-D5A9EDCC634A}']
@@ -223,6 +233,7 @@
     destructor Destroy; override;
   end;
 
+  {$IFDEF OLD_SOCKETS}
   TServerSocketImpl = class( TServerTransportImpl)
   private
     FServer : TTcpServer;
@@ -239,6 +250,7 @@
     procedure Listen; override;
     procedure Close; override;
   end;
+  {$ENDIF}
 
   TBufferedTransportImpl = class( TTransportImpl )
   private
@@ -263,6 +275,7 @@
     property IsOpen: Boolean read GetIsOpen;
   end;
 
+  {$IFDEF OLD_SOCKETS}
   TSocketImpl = class(TStreamTransportImpl)
   private
     FClient : TCustomIpClient;
@@ -284,6 +297,7 @@
     property Host : string read FHost;
     property Port: Integer read FPort;
   end;
+  {$ENDIF}
 
   TFramedTransportImpl = class( TTransportImpl)
   private const
@@ -531,6 +545,7 @@
 
 { TServerSocket }
 
+{$IFDEF OLD_SOCKETS}
 constructor TServerSocketImpl.Create( const AServer: TTcpServer; AClientTimeout: Integer);
 begin
   inherited Create;
@@ -727,6 +742,7 @@
   FInputStream := TTcpSocketStreamImpl.Create( FClient, FTimeout);
   FOutputStream := FInputStream;
 end;
+{$ENDIF}
 
 { TBufferedStream }
 
@@ -1168,6 +1184,7 @@
 
 { TTcpSocketStreamImpl }
 
+{$IFDEF OLD_SOCKETS}
 procedure TTcpSocketStreamImpl.Close;
 begin
   FTcpClient.Close;
@@ -1385,6 +1402,7 @@
 
   FTcpClient.SendBuf( Pointer(@buffer[offset])^, count);
 end;
+{$ENDIF}
 
 {$IF CompilerVersion < 21.0}
 initialization