Browse Source

Amiga: AsTag/TAG_ with unsigned overloads

git-svn-id: trunk@35164 -
marcus 8 years ago
parent
commit
f4a3a45c3f

+ 12 - 0
packages/amunits/src/coreunits/utility.pas

@@ -395,11 +395,13 @@ function TAG_(value: pointer): PtrUInt; overload; inline;
 function TAG_(value: pchar): PtrUInt; overload; inline;
 function TAG_(value: boolean): PtrUInt; overload; inline;
 function TAG_(value: LongInt): PtrUInt; overload; inline;
+function TAG_(Value: LongWord): PtrUInt; overload; inline;
 
 function AsTag(value: pointer): PtrUInt; overload; inline;
 function AsTag(value: pchar): PtrUInt; overload; inline;
 function AsTag(value: boolean): PtrUInt; overload; inline;
 function AsTag(value: LongInt): PtrUInt; overload; inline;
+function AsTag(Value: LongWord): PtrUInt; overload; inline;
 
 IMPLEMENTATION
 
@@ -472,6 +474,11 @@ begin
   TAG_:=PtrUInt(value);
 end;
 
+function TAG_(Value: LongWord): PtrUInt; inline;
+begin
+  TAG_ := PtrUInt(Value);
+end;
+
 function AsTag(value: pointer): PtrUInt; inline;
 begin
   AsTag:=PtrUInt(value);
@@ -495,6 +502,11 @@ begin
   AsTag:=PtrUInt(value);
 end;
 
+function AsTag(Value: LongWord): PtrUInt; inline;
+begin
+  AsTag := PtrUInt(Value);
+end;
+
 initialization
   UtilityBase := _UtilityBase;
 end.

+ 12 - 0
packages/arosunits/src/utility.pas

@@ -259,11 +259,13 @@ function TAG_(Value: Pointer): PtrUInt; overload; inline;
 function TAG_(Value: PChar): PtrUInt; overload; inline;
 function TAG_(Value: boolean): PtrUInt; overload; inline;
 function TAG_(Value: LongInt): PtrUInt; overload; inline;
+function TAG_(Value: LongWord): PtrUInt; overload; inline;
 
 function AsTag(Value: Pointer): PtrUInt; overload; inline;
 function AsTag(Value: PChar): PtrUInt; overload; inline;
 function AsTag(Value: boolean): PtrUInt; overload; inline;
 function AsTag(Value: LongInt): PtrUInt; overload; inline;
+function AsTag(Value: LongWord): PtrUInt; overload; inline;
 
 implementation
 
@@ -313,6 +315,11 @@ begin
   TAG_ := PtrUInt(Value);
 end;
 
+function TAG_(Value: LongWord): PtrUInt; inline;
+begin
+  TAG_ := PtrUInt(Value);
+end;
+
 function AsTag(Value: pointer): PtrUInt; inline;
 begin
   AsTag := PtrUInt(Value);
@@ -336,4 +343,9 @@ begin
   AsTag := PtrUInt(Value);
 end;
 
+function AsTag(Value: LongWord): PtrUInt; inline;
+begin
+  AsTag := PtrUInt(Value);
+end;
+
 end.

+ 33 - 21
packages/morphunits/src/utility.pas

@@ -211,15 +211,17 @@ function GetUniqueID: LongWord; SysCall MOS_UtilityBase 270;
 // varargs version
 function AllocNamedObject(Name: STRPTR; const Tags: array of PtrUInt): PNamedObject; inline;
 
-function TAG_(Value: Pointer): LongWord; overload; inline;
-function TAG_(Value: PChar): LongWord; overload; inline;
-function TAG_(Value: Boolean): LongWord; overload; inline;
-function TAG_(Value: LongInt): LongWord; overload; inline;
-
-function AsTag(Value: Pointer): LongWord; overload; inline;
-function AsTag(Value: PChar): LongWord; overload; inline;
-function AsTag(Value: Boolean): LongWord; overload; inline;
-function AsTag(Value: LongInt): LongWord; overload; inline;
+function TAG_(Value: Pointer): PtrUInt; overload; inline;
+function TAG_(Value: PChar): PtrUInt; overload; inline;
+function TAG_(Value: Boolean): PtrUInt; overload; inline;
+function TAG_(Value: LongInt): PtrUInt; overload; inline;
+function TAG_(Value: LongWord): PtrUInt; overload; inline;
+
+function AsTag(Value: Pointer): PtrUInt; overload; inline;
+function AsTag(Value: PChar): PtrUInt; overload; inline;
+function AsTag(Value: Boolean): PtrUInt; overload; inline;
+function AsTag(Value: LongInt): PtrUInt; overload; inline;
+function AsTag(Value: LongWord): PtrUInt; overload; inline;
 
 implementation
 
@@ -228,17 +230,17 @@ begin
   AllocNamedObject := AllocNamedObjectA(Name, @Tags);
 end;
 
-function TAG_(Value: Pointer): LongWord; inline;
+function TAG_(Value: Pointer): PtrUInt; inline;
 begin
-  TAG_ := LongWord(Value);
+  TAG_ := PtrUInt(Value);
 end;
 
-function TAG_(Value: PChar): LongWord; inline;
+function TAG_(Value: PChar): PtrUInt; inline;
 begin
-  TAG_ := LongWord(Value);
+  TAG_ := PtrUInt(Value);
 end;
 
-function TAG_(Value: Boolean): LongWord; inline;
+function TAG_(Value: Boolean): PtrUInt; inline;
 begin
   if Value then
     TAG_ := LTrue
@@ -246,9 +248,14 @@ begin
     TAG_ := LFalse;
 end;
 
-function TAG_(Value: LongInt): LongWord; inline;
+function TAG_(Value: LongInt): PtrUInt; inline;
 begin
-  TAG_ := LongWord(Value);
+  TAG_ := PtrUInt(Value);
+end;
+
+function TAG_(Value: LongWord): PtrUInt; inline;
+begin
+  TAG_ := PtrUInt(Value);
 end;
 
 function AsTag(Value: Pointer): LongWord; inline;
@@ -256,12 +263,12 @@ begin
   AsTag := LongWord(Value);
 end;
 
-function AsTag(Value: PChar): LongWord; inline;
+function AsTag(Value: PChar): PtrUInt; inline;
 begin
-  AsTag := LongWord(Value);
+  AsTag := PtrUInt(Value);
 end;
 
-function AsTag(Value: Boolean): LongWord; inline;
+function AsTag(Value: Boolean): PtrUInt; inline;
 begin
   if Value then
     AsTag := LTrue
@@ -269,9 +276,14 @@ begin
     AsTag := LFalse;
 end;
 
-function AsTag(Value: LongInt): LongWord; inline;
+function AsTag(Value: LongInt): PtrUInt; inline;
 begin
-  AsTag := LongWord(Value);
+  AsTag := PtrUInt(Value);
+end;
+
+function AsTag(Value: LongWord): PtrUInt; inline;
+begin
+  AsTag := PtrUInt(Value);
 end;
 
 begin