paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-04 21:30:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

+ Removed HASFUNCTIONCOPYDYNARR define

Browse Source 
git-svn-id: trunk@313 -
This commit is contained in:
michael 2005-06-09 18:06:35 +00:00
parent fccc19aa5c
commit 198b2104be
2 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rtl/inc/compproc.inc
View File

@ -52,12 +52,8 @@ Function fpc_shortstr_Copy(const s:shortstring;index:SizeInt;count:SizeInt):sho
Function fpc_ansistr_Copy (Const S : AnsiString; Index,Size : SizeInt) : AnsiString;compilerproc; Function fpc_ansistr_Copy (Const S : AnsiString; Index,Size : SizeInt) : AnsiString;compilerproc;
Function fpc_widestr_Copy (Const S : WideString; Index,Size : SizeInt) : WideString;compilerproc; Function fpc_widestr_Copy (Const S : WideString; Index,Size : SizeInt) : WideString;compilerproc;
function fpc_char_copy(c:char;index : SizeInt;count : SizeInt): shortstring;compilerproc; function fpc_char_copy(c:char;index : SizeInt;count : SizeInt): shortstring;compilerproc;
{$ifdef HASFUNCTIONCOPYDYNARR}
function fpc_dynarray_copy(psrc : pointer;ti : pointer; function fpc_dynarray_copy(psrc : pointer;ti : pointer;
lowidx,count:tdynarrayindex) : pointer;compilerproc; lowidx,count:tdynarrayindex) : pointer;compilerproc;
{$else HASFUNCTIONCOPYDYNARR}
procedure fpc_dynarray_copy(var pdest : pointer;psrc : pointer;ti : pointer;lowidx,count:tdynarrayindex);compilerproc;
{$endif HASFUNCTIONCOPYDYNARR}
function fpc_dynarray_length(p : pointer) : tdynarrayindex; compilerproc; function fpc_dynarray_length(p : pointer) : tdynarrayindex; compilerproc;
function fpc_dynarray_high(p : pointer) : tdynarrayindex; compilerproc; function fpc_dynarray_high(p : pointer) : tdynarrayindex; compilerproc;

14
rtl/inc/dynarr.inc
View File

@ -286,20 +286,12 @@ procedure fpc_dynarray_setlength(var p : pointer;pti : pointer;
end; end;
{$ifdef HASFUNCTIONCOPYDYNARR}
{ provide local access to dynarr_copy } { provide local access to dynarr_copy }
function int_dynarray_copy(psrc : pointer;ti : pointer; function int_dynarray_copy(psrc : pointer;ti : pointer;
lowidx,count:tdynarrayindex) : pointer;[external name 'FPC_DYNARR_COPY']; lowidx,count:tdynarrayindex) : pointer;[external name 'FPC_DYNARR_COPY'];
function fpc_dynarray_copy(psrc : pointer;ti : pointer; function fpc_dynarray_copy(psrc : pointer;ti : pointer;
lowidx,count:tdynarrayindex) : pointer;[Public,Alias:'FPC_DYNARR_COPY'];compilerproc; lowidx,count:tdynarrayindex) : pointer;[Public,Alias:'FPC_DYNARR_COPY'];compilerproc;
{$else HASFUNCTIONCOPYDYNARR}
procedure int_dynarray_copy(var pdest : pointer;psrc : pointer;ti : pointer;
lowidx,count:tdynarrayindex);[external name 'FPC_DYNARR_COPY'];
procedure fpc_dynarray_copy(var pdest : pointer;psrc : pointer;ti : pointer;
lowidx,count:tdynarrayindex);[Public,Alias:'FPC_DYNARR_COPY'];compilerproc;
{$endif HASFUNCTIONCOPYDYNARR}
var var
realpdest, realpdest,
realpsrc : pdynarray; realpsrc : pdynarray;
@ -308,15 +300,11 @@ procedure fpc_dynarray_copy(var pdest : pointer;psrc : pointer;ti : pointer;
highidx : tdynarrayindex; highidx : tdynarrayindex;
elesize : sizeint; elesize : sizeint;
eletype : pdynarraytypeinfo; eletype : pdynarraytypeinfo;
{$ifdef HASFUNCTIONCOPYDYNARR}
pdest : pointer; pdest : pointer;
{$endif HASFUNCTIONCOPYDYNARR}
begin begin
highidx:=lowidx+count-1; highidx:=lowidx+count-1;
pdest:=nil; pdest:=nil;
{$ifdef HASFUNCTIONCOPYDYNARR}
result:=pdest; result:=pdest;
{$endif HASFUNCTIONCOPYDYNARR}
if psrc=nil then if psrc=nil then
exit; exit;
realpsrc:=pdynarray(psrc-sizeof(tdynarray)); realpsrc:=pdynarray(psrc-sizeof(tdynarray));
@ -353,9 +341,7 @@ procedure fpc_dynarray_copy(var pdest : pointer;psrc : pointer;ti : pointer;
{ increment ref. count of members } { increment ref. count of members }
for i:= 0 to cnt-1 do for i:= 0 to cnt-1 do
int_addref(pointer(pdest+elesize*i),eletype); int_addref(pointer(pdest+elesize*i),eletype);
{$ifdef HASFUNCTIONCOPYDYNARR}
result:=pdest; result:=pdest;
{$endif HASFUNCTIONCOPYDYNARR}
end; end;