Delphi 10.1 had still broken unsafe result

Author: sglienke

Source/Base/Spring.Comparers.pas

@@ -39,11 +39,11 @@ interface
   TDefaultGenericInterface = Generics.Defaults.TDefaultGenericInterface;
 
   TComparer<T> = record
-    class function Default: IComparer<T>; static; {$IFDEF DELPHIX_BERLIN_UP}unsafe;{$ENDIF}
+    class function Default: IComparer<T>; static; {$IFDEF DELPHIX_TOKYO_UP}unsafe;{$ENDIF}
   end;
 
   TEqualityComparer<T> = record
-    class function Default: IEqualityComparer<T>; static; {$IFDEF DELPHIX_BERLIN_UP}unsafe;{$ENDIF}
+    class function Default: IEqualityComparer<T>; static; {$IFDEF DELPHIX_TOKYO_UP}unsafe;{$ENDIF}
   end;
 
   THashFunction = function(const key; len: Cardinal; seed: Integer = 0): Integer;
@@ -91,7 +91,7 @@ function SameGuid(const left, right: TGUID): Boolean;
 
 class function TComparer<T>.Default: IComparer<T>;
 begin
-  {$IFDEF DELPHIX_BERLIN_UP}
+  {$IFDEF DELPHIX_TOKYO_UP}
   Pointer(Result) := _LookupVtableInfo(giComparer, TypeInfo(T), SizeOf(T));
   {$ELSE}
   Result := IComparer<T>(_LookupVtableInfo(giComparer, TypeInfo(T), SizeOf(T)));
@@ -100,7 +100,7 @@ class function TComparer<T>.Default: IComparer<T>;
 
 class function TEqualityComparer<T>.Default: IEqualityComparer<T>;
 begin
-  {$IFDEF DELPHIX_BERLIN_UP}
+  {$IFDEF DELPHIX_TOKYO_UP}
   Pointer(Result) := _LookupVtableInfo(giEqualityComparer, TypeInfo(T), SizeOf(T));
   {$ELSE}
   Result := IEqualityComparer<T>(_LookupVtableInfo(giEqualityComparer, TypeInfo(T), SizeOf(T)));