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

change {$IFDEF FPC} for tkBool by {$IFDEF HAS_TKBOOL}

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@517 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
inoussa
2008-07-30 00:21:52 +00:00
parent f16101b47c
commit 9576d325a4
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
wst/trunk/base_service_intf.pas
View File

@ -1769,7 +1769,7 @@ begin
objData := GetObjectProp(AObject,p^.Name); objData := GetObjectProp(AObject,p^.Name);
AStore.Put(prpName,pt,objData); AStore.Put(prpName,pt,objData);
end; end;
{$IFDEF FPC} {$IFDEF HAS_TKBOOL}
tkBool : tkBool :
begin begin
boolData := Boolean(GetOrdProp(AObject,p^.Name)); boolData := Boolean(GetOrdProp(AObject,p^.Name));
@ -1934,7 +1934,7 @@ begin
AStore.Get(pt,propName,strData); AStore.Get(pt,propName,strData);
SetStrProp(AObject,p^.Name,strData); SetStrProp(AObject,p^.Name,strData);
End; End;
{$IFDEF FPC} {$IFDEF HAS_TKBOOL}
tkBool : tkBool :
Begin Begin
AStore.Get(pt,propName,boolData); AStore.Get(pt,propName,boolData);
@ -3984,7 +3984,7 @@ begin
case p^.PropType^.Kind of case p^.PropType^.Kind of
tkInt64{$IFDEF HAS_QWORD} ,tkQWord{$ENDIF} : tkInt64{$IFDEF HAS_QWORD} ,tkQWord{$ENDIF} :
SetInt64Prop(Self,p,GetInt64Prop(Source,p^.Name)); SetInt64Prop(Self,p,GetInt64Prop(Source,p^.Name));
{$IFDEF FPC}tkBool,{$ENDIF} tkEnumeration, tkInteger : {$IFDEF HAS_TKBOOL}tkBool,{$ENDIF} tkEnumeration, tkInteger :
SetOrdProp(Self,p,GetOrdProp(Source,p^.Name)); SetOrdProp(Self,p,GetOrdProp(Source,p^.Name));
tkLString{$IFDEF FPC}, tkAString{$ENDIF} : tkLString{$IFDEF FPC}, tkAString{$ENDIF} :
SetStrProp(Self,p,GetStrProp(Source,p^.Name)); SetStrProp(Self,p,GetStrProp(Source,p^.Name));
@ -4047,7 +4047,7 @@ begin
case p^.PropType^.Kind of case p^.PropType^.Kind of
tkInt64{$IFDEF HAS_QWORD} ,tkQWord{$ENDIF} : tkInt64{$IFDEF HAS_QWORD} ,tkQWord{$ENDIF} :
ok := ( GetInt64Prop(Self,p^.Name) = GetInt64Prop(ACompareTo,p^.Name) ); ok := ( GetInt64Prop(Self,p^.Name) = GetInt64Prop(ACompareTo,p^.Name) );
{$IFDEF FPC}tkBool,{$ENDIF} tkEnumeration, tkInteger : {$IFDEF HAS_TKBOOL}tkBool,{$ENDIF} tkEnumeration, tkInteger :
ok := ( GetOrdProp(Self,p^.Name) = GetOrdProp(ACompareTo,p^.Name) ); ok := ( GetOrdProp(Self,p^.Name) = GetOrdProp(ACompareTo,p^.Name) );
tkLString{$IFDEF FPC}, tkAString{$ENDIF} : tkLString{$IFDEF FPC}, tkAString{$ENDIF} :
ok := ( GetStrProp(Self,p^.Name) = GetStrProp(ACompareTo,p^.Name) ); ok := ( GetStrProp(Self,p^.Name) = GetStrProp(ACompareTo,p^.Name) );
@ -4132,7 +4132,7 @@ begin
objData := GetObjectProp(AObject,p^.Name); objData := GetObjectProp(AObject,p^.Name);
AStore.Put(propName,pt,objData); AStore.Put(propName,pt,objData);
end; end;
{$IFDEF FPC} {$IFDEF HAS_TKBOOL}
tkBool : tkBool :
begin begin
boolData := Boolean(GetOrdProp(AObject,p^.Name)); boolData := Boolean(GetOrdProp(AObject,p^.Name));
@ -4247,7 +4247,7 @@ Var
strData : String; strData : String;
objData : TObject; objData : TObject;
objDataCreateHere : Boolean; objDataCreateHere : Boolean;
{$IFDEF FPC}boolData : Boolean;{$ENDIF} {$IFDEF HAS_TKBOOL}boolData : Boolean;{$ENDIF}
p : PPropInfo; p : PPropInfo;
enumData : TEnumBuffer; enumData : TEnumBuffer;
floatDt : TFloatExtendedType; floatDt : TFloatExtendedType;
@ -4290,7 +4290,7 @@ begin
AStore.Get(pt,propName,strData); AStore.Get(pt,propName,strData);
SetStrProp(AObject,p^.Name,strData); SetStrProp(AObject,p^.Name,strData);
End; End;
{$IFDEF FPC} {$IFDEF HAS_TKBOOL}
tkBool : tkBool :
Begin Begin
AStore.Get(pt,propName,boolData); AStore.Get(pt,propName,boolData);
@ -5128,7 +5128,7 @@ begin
tkLString{$IFDEF FPC},tkAString{$ENDIF} : AStore.Put(prpName,pt,PString(recFieldAddress)^); tkLString{$IFDEF FPC},tkAString{$ENDIF} : AStore.Put(prpName,pt,PString(recFieldAddress)^);
tkClass : AStore.Put(prpName,pt,PObject(recFieldAddress)^); tkClass : AStore.Put(prpName,pt,PObject(recFieldAddress)^);
tkRecord : AStore.Put(prpName,pt,Pointer(recFieldAddress)^); tkRecord : AStore.Put(prpName,pt,Pointer(recFieldAddress)^);
{$IFDEF FPC} {$IFDEF HAS_TKBOOL}
tkBool : AStore.Put(prpName,pt,PBoolean(recFieldAddress)^); tkBool : AStore.Put(prpName,pt,PBoolean(recFieldAddress)^);
{$ENDIF} {$ENDIF}
tkEnumeration,tkInteger : tkEnumeration,tkInteger :
@ -5229,7 +5229,7 @@ begin
tkQWord : AStore.Get(pt,propName,PQWord(recFieldAddress)^); tkQWord : AStore.Get(pt,propName,PQWord(recFieldAddress)^);
{$ENDIF} {$ENDIF}
tkLString{$IFDEF FPC}, tkAString{$ENDIF} : AStore.Get(pt,propName,PString(recFieldAddress)^); tkLString{$IFDEF FPC}, tkAString{$ENDIF} : AStore.Get(pt,propName,PString(recFieldAddress)^);
{$IFDEF FPC} {$IFDEF HAS_TKBOOL}
tkBool : AStore.Get(pt,propName,PBoolean(recFieldAddress)^); tkBool : AStore.Get(pt,propName,PBoolean(recFieldAddress)^);
{$ENDIF} {$ENDIF}
tkClass : AStore.Get(pt,propName,PObject(recFieldAddress)^); tkClass : AStore.Get(pt,propName,PObject(recFieldAddress)^);