Merged with delphi 2010 branch

[lcore.git] / bsearchtree.pas

diff --git a/bsearchtree.pas b/bsearchtree.pas
index ad61751e498b6b291e982f55792c625468eb0467..d9e3ea26523f94a13b1c8819b38301725061e6de 100644 (file)
--- a/bsearchtree.pas
+++ b/bsearchtree.pas
@@ -17,24 +17,24 @@ const
 type\r
   thashitem=class(tlinklist)\r
     hash:integer;\r
 type\r
   thashitem=class(tlinklist)\r
     hash:integer;\r

-    s:string;\r
+    s:ansistring;\r

     p:pointer;\r
   end;\r
   thashtable=array[0..hashtable_size-1] of thashitem;\r
   phashtable=^thashtable;\r
 \r
 {adds "item" to the tree for name "s". the name must not exist (no checking done)}\r
     p:pointer;\r
   end;\r
   thashtable=array[0..hashtable_size-1] of thashitem;\r
   phashtable=^thashtable;\r
 \r
 {adds "item" to the tree for name "s". the name must not exist (no checking done)}\r

-procedure addtree(t:phashtable;s:string;item:pointer);\r
+procedure addtree(t:phashtable;s:ansistring;item:pointer);\r

 \r
 {removes name "s" from the tree. the name must exist (no checking done)}\r
 \r
 {removes name "s" from the tree. the name must exist (no checking done)}\r

-procedure deltree(t:phashtable;s:string);\r
+procedure deltree(t:phashtable;s:ansistring);\r

 \r
 {returns the item pointer for s, or nil if not found}\r
 \r
 {returns the item pointer for s, or nil if not found}\r

-function findtree(t:phashtable;s:string):pointer;\r
+function findtree(t:phashtable;s:ansistring):pointer;\r

 \r
 implementation\r
 \r
 \r
 implementation\r
 \r

-function makehash(s:string):integer;\r
+function makehash(s:ansistring):integer;\r

 const\r
   shifter=6;\r
 var\r
 const\r
   shifter=6;\r
 var\r


@@ -48,7 +48,7 @@ begin
   result := (result xor result shr 16) and (hashtable_size-1);\r
 end;\r
 \r
   result := (result xor result shr 16) and (hashtable_size-1);\r
 end;\r
 \r

-procedure addtree(t:phashtable;s:string;item:pointer);\r
+procedure addtree(t:phashtable;s:ansistring;item:pointer);\r

 var\r
   hash:integer;\r
   p:thashitem;\r
 var\r
   hash:integer;\r
   p:thashitem;\r


@@ -61,7 +61,7 @@ begin
   linklistadd(tlinklist(t[hash]),tlinklist(p));\r
 end;\r
 \r
   linklistadd(tlinklist(t[hash]),tlinklist(p));\r
 end;\r
 \r

-procedure deltree(t:phashtable;s:string);\r
+procedure deltree(t:phashtable;s:ansistring);\r

 var\r
   p,p2:thashitem;\r
   hash:integer;\r
 var\r
   p,p2:thashitem;\r
   hash:integer;\r


@@ -81,7 +81,7 @@ begin
 end;\r
 \r
 \r
 end;\r
 \r
 \r

-function findtree(t:phashtable;s:string):pointer;\r
+function findtree(t:phashtable;s:ansistring):pointer;\r

 var\r
   p:thashitem;\r
   hash:integer;\r
 var\r
   p:thashitem;\r
   hash:integer;\r