Browse Source

Fix compilation with 2.6.x.

rtl/inc/rtti.inc:
  * RecordRTTI: don't check for IsWeak field for 2.6.x
  * fpc_copy: assume IsWeak as False for 2.6.x

git-svn-id: branches/svenbarth/arc@28873 -
svenbarth 10 years ago
parent
commit
6225112e52
1 changed files with 6 additions and 0 deletions
  1. 6 0
      rtl/inc/rtti.inc

+ 6 - 0
rtl/inc/rtti.inc

@@ -120,7 +120,9 @@ begin
   { Process elements }
   for i:=1 to count Do
     begin
+{$ifndef VER2_6}
       if not PRecordElement(typeInfo)^.IsWeak then
+{$endif}
         rttiproc(Data+PRecordElement(typeInfo)^.Offset,PRecordElement(typeInfo)^.TypeInfo);
       Inc(PRecordElement(typeInfo));
     end;
@@ -355,7 +357,11 @@ begin
           begin
             Info:=PRecordElement(Temp)^.TypeInfo;
             Offset:=PRecordElement(Temp)^.Offset;
+            {$ifdef VER2_6}
+            IsWeak:=False;
+            {$else}
             IsWeak:=PRecordElement(Temp)^.IsWeak;
+            {$endif}
             Inc(PRecordElement(Temp));
             if Offset>expectedoffset then
               move((Src+expectedoffset)^,(Dest+expectedoffset)^,Offset-expectedoffset);