mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-08-16 16:39:19 +02:00
* heaperror is gone
This commit is contained in:
parent
cd35d3fd5e
commit
b19edee1d4
@ -197,10 +197,10 @@ Begin
|
|||||||
if globalresult <> GLOBAL_RESULT then
|
if globalresult <> GLOBAL_RESULT then
|
||||||
failed:= true;
|
failed:= true;
|
||||||
|
|
||||||
|
{$ifdef dummy}
|
||||||
globalresult := GLOBAL_RESULT;
|
globalresult := GLOBAL_RESULT;
|
||||||
{ secondcalln : class constructor failure, when getmem returns 0,
|
{ secondcalln : class constructor failure, when getmem returns 0,
|
||||||
that will call class_help_fail and abort class construction }
|
that will call class_help_fail and abort class construction }
|
||||||
{$ifdef fpc}
|
|
||||||
heaperror := @myheaperrornil;
|
heaperror := @myheaperrornil;
|
||||||
try
|
try
|
||||||
class_none_fail:=tclass2.create_none;
|
class_none_fail:=tclass2.create_none;
|
||||||
@ -209,15 +209,12 @@ Begin
|
|||||||
end;
|
end;
|
||||||
if globalresult <> GLOBAL_RESULT then
|
if globalresult <> GLOBAL_RESULT then
|
||||||
failed:= true;
|
failed:= true;
|
||||||
{$endif fpc}
|
|
||||||
|
|
||||||
globalresult := 0;
|
|
||||||
{ secondcalln : class constructor failure, getmem gives a runtime error
|
{ secondcalln : class constructor failure, getmem gives a runtime error
|
||||||
that will be translated to a exception and the exception shall be catched
|
that will be translated to a exception and the exception shall be catched
|
||||||
here }
|
here }
|
||||||
{$ifdef fpc}
|
globalresult := 0;
|
||||||
heaperror := @myheaperrorexception;
|
heaperror := @myheaperrorexception;
|
||||||
{$endif fpc}
|
|
||||||
try
|
try
|
||||||
class_none_fail:=tclass2.create_none;
|
class_none_fail:=tclass2.create_none;
|
||||||
except
|
except
|
||||||
@ -225,7 +222,7 @@ Begin
|
|||||||
end;
|
end;
|
||||||
if globalresult <> GLOBAL_RESULT then
|
if globalresult <> GLOBAL_RESULT then
|
||||||
failed:= true;
|
failed:= true;
|
||||||
|
{$endif dummy}
|
||||||
|
|
||||||
if failed then
|
if failed then
|
||||||
fail
|
fail
|
||||||
@ -236,7 +233,10 @@ end.
|
|||||||
|
|
||||||
{
|
{
|
||||||
$Log$
|
$Log$
|
||||||
Revision 1.5 2003-10-03 14:46:37 peter
|
Revision 1.6 2004-06-29 20:55:29 peter
|
||||||
|
* heaperror is gone
|
||||||
|
|
||||||
|
Revision 1.5 2003/10/03 14:46:37 peter
|
||||||
* popstack to oldfpccall
|
* popstack to oldfpccall
|
||||||
|
|
||||||
Revision 1.4 2002/09/07 15:40:52 peter
|
Revision 1.4 2002/09/07 15:40:52 peter
|
||||||
|
Loading…
Reference in New Issue
Block a user