From dbbe861797c9f7866c18a430a34a185244213794 Mon Sep 17 00:00:00 2001 From: paul Date: Thu, 29 Jul 2010 01:47:57 +0000 Subject: [PATCH] rtl: make fgl compilable with 2.4.0 git-svn-id: trunk@15658 - --- rtl/objpas/fgl.pp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/rtl/objpas/fgl.pp b/rtl/objpas/fgl.pp index 1d736b091d..85ef2e12b3 100644 --- a/rtl/objpas/fgl.pp +++ b/rtl/objpas/fgl.pp @@ -23,6 +23,10 @@ interface uses types, sysutils; +{$IF defined(VER2_4)} + {$DEFINE OldSyntax} +{$IFEND} + const MaxListSize = Maxint div 16; @@ -103,8 +107,7 @@ type PTypeList = ^TTypeList; PT = ^T; TFPGListEnumeratorSpec = specialize TFPGListEnumerator; - protected - var + {$ifndef OldSyntax}protected var{$else}var protected{$endif} FOnCompare: TCompareFunc; procedure CopyItem(Src, Dest: Pointer); override; procedure Deref(Item: Pointer); override; @@ -136,8 +139,7 @@ type TTypeList = array[0..MaxGListSize] of T; PTypeList = ^TTypeList; PT = ^T; - protected - var + {$ifndef OldSyntax}protected var{$else}var protected{$endif} FOnCompare: TCompareFunc; FFreeObjects: Boolean; procedure CopyItem(Src, Dest: Pointer); override; @@ -170,8 +172,7 @@ type TTypeList = array[0..MaxGListSize] of T; PTypeList = ^TTypeList; PT = ^T; - protected - var + {$ifndef OldSyntax}protected var{$else}var protected{$endif} FOnCompare: TCompareFunc; procedure CopyItem(Src, Dest: Pointer); override; procedure Deref(Item: Pointer); override; @@ -256,8 +257,7 @@ type TDataCompareFunc = function(const Data1, Data2: TData): Integer; PKey = ^TKey; PData = ^TData; - protected - var + {$ifndef OldSyntax}protected var{$else}var protected{$endif} FOnKeyCompare: TKeyCompareFunc; FOnDataCompare: TDataCompareFunc; procedure CopyItem(Src, Dest: Pointer); override;