Changeset 522 for GraphicTest/Packages/Graphics32/GR32_Containers.pas

Timestamp:

Apr 17, 2019, 10:42:18 AM (5 years ago)

Author:

chronos

Message:

• Modified: Updated Graphics32 library.

Location:

GraphicTest/Packages/Graphics32

Files:

• . (modified) (1 prop)
• GR32_Containers.pas (modified) (9 diffs)

GraphicTest/Packages/Graphics32/GR32_Containers.pas

@@ -40 +40 @@
 uses
 {$IFDEF FPC}
-  Types,
   {$IFDEF Windows}
   Windows,
+  {$ELSE}
+  Types,
   {$ENDIF}
 {$ELSE}
-  Windows,
+  Types, Windows,
 {$ENDIF}
   RTLConsts,
-  GR32, SysUtils, GR32_LowLevel, Classes, TypInfo;
+  GR32, SysUtils, Classes, TypInfo;
 
 const
@@ -180 +181 @@
     function First: TClass;
     function Last: TClass;
-    function Find(AClassName: string): TClass;
+    function Find(const AClassName: string): TClass;
     procedure GetClassNames(Strings: TStrings);
     procedure Insert(Index: Integer; AClass: TClass);
@@ -231 +232 @@
 implementation
 
+uses
+  GR32_LowLevel;
+
 procedure SmartAssign(Src, Dst: TPersistent; TypeKinds: TTypeKinds = tkProperties);
 var
@@ -247 +251 @@
     Count := GetPropList(Src.ClassInfo, TypeKinds, Props, False);
 
+    {$IFNDEF NEXTGEN}
     for I := 0 to Count - 1 do
     with Props^[I]^ do
@@ -262 +267 @@
         SetPropValue(Dst, string(Name), GetPropValue(Src, string(Name), True));
     end;
+    {$ENDIF}
   finally
     FreeMem(Props, Count * SizeOf(PPropInfo));
@@ -422 +428 @@
   I: Integer;
 begin
+{$IFDEF HAS_NATIVEINT}
+  BucketIndex := NativeUInt(Item) shr 8 and BUCKET_MASK; // KISS pointer hash(TM)
+{$ELSE}
   BucketIndex := Cardinal(Item) shr 8 and BUCKET_MASK; // KISS pointer hash(TM)
+{$ENDIF}
   // due to their randomness, pointers most commonly differ at byte 1, we use
   // this characteristic for our hash and just apply the mask to it.
@@ -444 +454 @@
 begin
   if not Exists(Item, BucketIndex, ItemIndex) then
+{$IFDEF FPC}
+    raise EListError.CreateFmt(SItemNotFound, [Item])
+{$ELSE}
+{$IFDEF HAS_NATIVEINT}
+    raise EListError.CreateFmt(SItemNotFound, [NativeInt(Item)])
+{$ELSE}
     raise EListError.CreateFmt(SItemNotFound, [Integer(Item)])
+{$ENDIF}
+{$ENDIF}
   else
     Result := FBuckets[BucketIndex].Items[ItemIndex].Data;
@@ -454 +472 @@
 begin
   if not Exists(Item, BucketIndex, ItemIndex) then
+{$IFDEF FPC}
+    raise EListError.CreateFmt(SItemNotFound, [Item])
+{$ELSE}
+{$IFDEF HAS_NATIVEINT}
+    raise EListError.CreateFmt(SItemNotFound, [NativeInt(Item)])
+{$ELSE}
     raise EListError.CreateFmt(SItemNotFound, [Integer(Item)])
+{$ENDIF}
+{$ENDIF}
   else
     FBuckets[BucketIndex].Items[ItemIndex].Data := Data;
@@ -644 +670 @@
 end;
 
-function TClassList.Find(AClassName: string): TClass;
+function TClassList.Find(const AClassName: string): TClass;
 var
   I: Integer;