From ea4816281b0a8c6d8350d2ca6cf5ce609dba8b58 Mon Sep 17 00:00:00 2001 From: inoussa Date: Sat, 6 Feb 2010 15:45:07 +0000 Subject: [PATCH] Use fixed enum values to be maximize on the wire compatibility git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@1154 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- wst/trunk/base_binary_formatter.pas | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/wst/trunk/base_binary_formatter.pas b/wst/trunk/base_binary_formatter.pas index 2a01d837c..3a0434801 100644 --- a/wst/trunk/base_binary_formatter.pas +++ b/wst/trunk/base_binary_formatter.pas @@ -38,17 +38,18 @@ type TDataName = String; TDataType = ( - dtInt8U, dtInt8S, - dtInt16U, dtInt16S, - dtInt32U, dtInt32S, - dtInt64U, dtInt64S, - dtBool, dtAnsiChar, dtWideChar, dtEnum, - dtSingle, dtDouble, dtExtended, dtCurrency, - dtAnsiString, dtWideString, + dtInt8U = 1, dtInt8S = 2, + dtInt16U = 3, dtInt16S = 4, + dtInt32U = 5, dtInt32S = 6, + dtInt64U = 7, dtInt64S = 8, + dtBool = 9, + dtAnsiChar = 10, dtWideChar = 11, dtEnum = 12, + dtSingle = 13, dtDouble = 14, dtExtended = 15, dtCurrency = 16, + dtAnsiString = 17, dtWideString = 18, {$IFDEF WST_UNICODESTRING} - dtUnicodeString, + dtUnicodeString = 19, {$ENDIF WST_UNICODESTRING} - dtObject, dtArray + dtObject = 30, dtArray = 31 ); const dtDefaultString = @@ -581,7 +582,7 @@ Begin Else Raise EBinaryFormatterException.CreateFmt(SERR_IndexOutOfBound,[AIndex]) End Else Begin - Raise EBinaryFormatterException.CreateFmt(SERR_InvalidDataTypeInContext,[GetEnumName(TypeInfo(TDataType), Ord(AOwner^.DataType))]) + Raise EBinaryFormatterException.CreateFmt(SERR_InvalidDataTypeInContext,[IntToStr(Ord(AOwner^.DataType))]) End; End;