From f40fe5235a056546368fc1a034ac5ce8cf2b21f7 Mon Sep 17 00:00:00 2001 From: Ron Pinkas Date: Tue, 5 Sep 2000 22:32:33 +0000 Subject: [PATCH] 2000-09-05 15:30 UTC+0800 Ron Pinkas * include/hbclass.ch ! Changed AS STRING to AS String, AS NUMERIC to AS Numeric, AS OBJECT to AS Object to avoid collision with FW #defines in dll.ch. --- harbour/ChangeLog | 4 ++++ harbour/include/hbclass.ch | 18 +++++++++--------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 2e131746b0..2bf3f77f0a 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,7 @@ +2000-09-05 15:30 UTC+0800 Ron Pinkas + * include/hbclass.ch + ! Changed AS STRING to AS String, AS NUMERIC to AS Numeric, AS OBJECT to AS Object to avoid collision with FW #defines in dll.ch. + 2000-09-05 14:45 UTC-0400 David G. Holm * config/dos/bcc16.cf diff --git a/harbour/include/hbclass.ch b/harbour/include/hbclass.ch index 95db375c59..7dfcc3d6ba 100644 --- a/harbour/include/hbclass.ch +++ b/harbour/include/hbclass.ch @@ -49,15 +49,15 @@ */ DECLARE TClass ; - New( cName AS STRING, OPTIONAL SuperParams ) AS CLASS TClass ; - Create() AS OBJECT; - Instance() AS OBJECT ; - AddClsMthds( cName AS STRING, @MethodName(), nScope AS NUMERIC, n2 AS NUMERIC, n3 AS NUMERIC ); - AddMultiClsData( cType AS STRING, uVal, nScope AS NUMERIC, aDatas AS ARRAY OF STRING ); - AddMultiData( cType AS STRING, uVal, nScope AS NUMERIC, aDatas AS ARRAY OF STRING ); - AddMethod( cName AS STRING, @MethodName(), nScope AS NUMERIC ); - AddInLine( cName AS STRING, bBlock AS CODEBLOCK, nScope AS NUMERIC ); - AddVirtual( cName AS STRING ) + New( cName AS String, OPTIONAL SuperParams ) AS CLASS TClass ; + Create() AS Object; + Instance() AS Object ; + AddClsMthds( cName AS String, @MethodName(), nScope AS Numeric, n2 AS Numeric, n3 AS Numeric ); + AddMultiClsData( cType AS String, uVal, nScope AS Numeric, aDatas AS ARRAY OF String ); + AddMultiData( cType AS String, uVal, nScope AS Numeric, aDatas AS ARRAY OF String ); + AddMethod( cName AS String, @MethodName(), nScope AS Numeric ); + AddInLine( cName AS String, bBlock AS CodeBlock, nScope AS Numeric ); + AddVirtual( cName AS String ) #ifndef HB_CLASS_CH_ #define HB_CLASS_CH_