From ea7b9d69d51642f829cdf403976da3de9fff203d Mon Sep 17 00:00:00 2001
From: Przemyslaw Czerpak <druzus@priv.onet.pl>
Date: Sun, 10 Aug 2008 10:59:11 +0000
Subject: [PATCH] 2008-08-10 12:58 UTC+0200 Przemyslaw Czerpak
 (druzus/at/priv.onet.pl)   * harbour/include/hbextern.ch     * include scalar
 classes only when HB_REQUEST_SCALLAR define is set

  * harbour/source/rtl/tobject.prg
    ! use <obj>:className instead of __objGetClsName( <obj> ) in error
      message
---
 harbour/ChangeLog              | 8 ++++++++
 harbour/include/hbextern.ch    | 2 ++
 harbour/source/rtl/tobject.prg | 2 +-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index cc14fa983a..7966fbd158 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,14 @@
    2008-12-31 13:59 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2008-08-10 12:58 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/include/hbextern.ch
+    * include scalar classes only when HB_REQUEST_SCALLAR define is set
+
+  * harbour/source/rtl/tobject.prg
+    ! use <obj>:className instead of __objGetClsName( <obj> ) in error
+      message
+
 2008-08-09 21:44 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
    * doc/whatsnew.txt
      * Minor corrections.
diff --git a/harbour/include/hbextern.ch b/harbour/include/hbextern.ch
index c0e462b34b..621c8014b4 100644
--- a/harbour/include/hbextern.ch
+++ b/harbour/include/hbextern.ch
@@ -1190,6 +1190,7 @@ EXTERNAL HB_GZCLEARERR
 EXTERNAL HBCLASS
 EXTERNAL HBOBJECT
 EXTERNAL HBSCALAR
+#ifdef HB_REQUEST_SCALLAR
 EXTERNAL HBARRAY
 EXTERNAL HBBLOCK
 EXTERNAL HBCHARACTER
@@ -1197,6 +1198,7 @@ EXTERNAL HBDATE
 EXTERNAL HBLOGICAL
 EXTERNAL HBNIL
 EXTERNAL HBNUMERIC
+#endif /* HB_REQUEST_SCALLAR */
 
 /* FlagShip extension */
 
diff --git a/harbour/source/rtl/tobject.prg b/harbour/source/rtl/tobject.prg
index 613f273f6a..cc38f7f8dc 100644
--- a/harbour/source/rtl/tobject.prg
+++ b/harbour/source/rtl/tobject.prg
@@ -102,7 +102,7 @@ FUNCTION HBObject()
 
       s_oClass:SetOnError( @HBObject_DftonError() )
 
-      s_oClass:AddInline( "MSGNOTFOUND" , {| Self, cMsg | ::Error( "Message not found", __OBJGETCLSNAME( Self ), cMsg, IIF( Left( cMsg, 1 ) == "_", 1005, 1004 ) ) }, HB_OO_CLSTP_EXPORTED )
+      s_oClass:AddInline( "MSGNOTFOUND" , {| Self, cMsg | ::Error( "Message not found", Self:className, cMsg, IIF( Left( cMsg, 1 ) == "_", 1005, 1004 ) ) }, HB_OO_CLSTP_EXPORTED )
 
       /*s_oClass:AddMultiData( , , HB_OO_CLSTP_EXPORTED, { "CLASS" }, .F. ) */