Update of /cvsroot/instantobjects/Source/Brokers/XML
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6353
Modified Files:
InstantXML.pas
Log Message:
1. Modified to use 'InstantDefines.inc'.
2. Changed CreateResFmt() to CreateFmt() when raising exceptions.
Index: InstantXML.pas
===================================================================
RCS file: /cvsroot/instantobjects/Source/Brokers/XML/InstantXML.pas,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** InstantXML.pas 10 Feb 2005 23:06:25 -0000 1.3
--- InstantXML.pas 21 Mar 2005 02:33:06 -0000 1.4
***************
*** 29,36 ****
unit InstantXML;
interface
uses
! {$IFDEF VER130}{$DEFINE MSWINDOWS}FileCtrl,{$ENDIF}
Classes, DB, InstantPersistence, InstantCommand, Contnrs;
--- 29,40 ----
unit InstantXML;
+ {$I InstantDefines.inc}
+
interface
uses
! {$IFDEF MSWINDOWS}
! FileCtrl,
! {$ENDIF}
Classes, DB, InstantPersistence, InstantCommand, Contnrs;
***************
*** 390,394 ****
if Result and (ConflictAction = caFail) then
! raise EInstantConflict.CreateResFmt(@SUpdateConflict,
[AObject.ClassName, AObjectId]);
end;
--- 394,398 ----
if Result and (ConflictAction = caFail) then
! raise EInstantConflict.CreateFmt(SUpdateConflict,
[AObject.ClassName, AObjectId]);
end;
***************
*** 440,444 ****
end;
end else if Map.IsRootMap and (ConflictAction = caFail) then
! raise EInstantConflict.CreateResFmt(@SDisposeConflict,
[AObject.ClassName, AObject.PersistentId])
end;
--- 444,448 ----
end;
end else if Map.IsRootMap and (ConflictAction = caFail) then
! raise EInstantConflict.CreateFmt(SDisposeConflict,
[AObject.ClassName, AObject.PersistentId])
end;
|
