pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

FPC-2.6.2 compatibility fix

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@2842 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
inoussa
2013-11-19 15:25:37 +00:00
parent 29fbe0a4b9
commit 3222dc18bc
2 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
wst/trunk/ws_helper/xsd_parser.pas
View File

@ -209,6 +209,23 @@ begin
Result := ANode.NodeValue;
end;
function HasProp(AClass : TPasClassType; const AProp : string) : Boolean;
var
i : Integer;
ml : TList2;
e : TPasElement;
begin
Result := False;
ml := AClass.Members;
for i := 0 to ml.Count - 1 do begin
e := TPasElement(ml[i]);
if e.InheritsFrom(TPasProperty) and SameText(e.Name,AProp) then begin
Result := True;
Break;
end;
end;
end;
procedure CheckDuplicatedProperties(
AClassList : TList2;
ASymbolTable : TwstPasTreeContainer
@ -240,7 +257,7 @@ begin
e := TPasElement(locItem.Members[k]);
if not e.InheritsFrom(TPasProperty) then
Continue;
if (TPasClassType(locAncestor).FindMember(TPasProperty,e.Name) <> nil) then begin
if HasProp(TPasClassType(locAncestor),e.Name) then begin
locItem.Members.Delete(k);
e.Release();
Continue;

2
wst/trunk/wst_global.inc
View File

@ -59,7 +59,7 @@
{$IF Defined(FPC_FULLVERSION) and (FPC_FULLVERSION >= 20600) }
{$DEFINE HAS_DEFAULT_FORMAT_SETTINGS}
{$IFEND}
{$IF Defined(FPC_FULLVERSION) and (FPC_FULLVERSION > 20601) }
{$IF Defined(FPC_FULLVERSION) and (FPC_FULLVERSION > 20602) }
{$DEFINE HAS_EXP_TREE}
{$IFEND}
{$ENDIF}