2012-06-07 12:15 UTC+0200 Viktor Szakats (harbour syenar.net)

* include/Makefile * include/common.ch + include/hbhash.ch + moved hash-related constants from common.ch to new hbhash.ch ; common.ch include hbhash.ch for compatibility, protected by HB_LEGACY_LEVEL4 so it will stop being included automatically. If you use HB_HAUTOADD_* or HB_HMERGE_* constants, make sure to #include "hbhash.ch". * contrib/hbrun/headers.prg * utils/hbmk2/hbmk2.prg + include hbhash.ch * src/rdd/hbsix/sxini.prg * use hbhash.ch instead of common.ch
2012-06-07 10:20:17 +00:00
parent d3a349b87f
commit 9684accf5f
7 changed files with 113 additions and 32 deletions
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,36 +16,53 @@
   The license applies to all entries newer than 2009-04-28.
 */

+2012-06-07 12:15 UTC+0200 Viktor Szakats (harbour syenar.net)
+  * include/Makefile
+  * include/common.ch
+  + include/hbhash.ch
+    + moved hash-related constants from common.ch to new hbhash.ch
+    ; common.ch include hbhash.ch for compatibility, protected by
+      HB_LEGACY_LEVEL4 so it will stop being included automatically.
+      If you use HB_HAUTOADD_* or HB_HMERGE_* constants, make sure
+      to #include "hbhash.ch".
+
+  * contrib/hbrun/headers.prg
+  * utils/hbmk2/hbmk2.prg
+    + include hbhash.ch
+
+  * src/rdd/hbsix/sxini.prg
+    * use hbhash.ch instead of common.ch
+
 2012-06-06 21:26 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
  * contrib/hbqt/tests/qtrevamp.prg
-    - Removed: note on returned QAction if it is not of same type 
-      as stated in previous commit. New hbQT is always returning 
-      NIL if a valid Qt pointer could not been obtained. This holds 
-      true for all type of objects. Actually I did not test it 
-      along these lines. So with __HBQT_REVAMP__ there is no need 
-      of :isValidPointer() any more, just test a returned object 
+    - Removed: note on returned QAction if it is not of same type
+      as stated in previous commit. New hbQT is always returning
+      NIL if a valid Qt pointer could not been obtained. This holds
+      true for all type of objects. Actually I did not test it
+      along these lines. So with __HBQT_REVAMP__ there is no need
+      of :isValidPointer() any more, just test a returned object
      against NIL.

 2012-06-06 18:54 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
  * contrib/hbqt/qtcore/hbqt_bind.cpp
    * Struggled: to set pointer arithmatic to be used properly.
-      Also at times Qt returns different type instead of one 
+      Also at times Qt returns different type instead of one
      defined in documentation, but referred in description part only.
-      For example, a popup menu returns null instead of QAction if 
-      no item is selected or user pressed escape. This is not 
-      possible to manage such instances in present engine. For 
+      For example, a popup menu returns null instead of QAction if
+      no item is selected or user pressed escape. This is not
+      possible to manage such instances in present engine. For
      this reason only :isValidPointer() method was introduced.
-      In REVAMPED hbQT this is different. So to test it, the only 
+      In REVAMPED hbQT this is different. So to test it, the only
      way to ascertain is if the Harbour class name is of same type.

  * contrib/hbqt/tests/qtrevamp.prg
-    + Added: popup menu option to demonstrate what happens 
-      at the background, if tracelog is activated.    
+    + Added: popup menu option to demonstrate what happens
+      at the background, if tracelog is activated.

-    ; NOTE: I am not from C or C++ background at all, so some things 
-      may not be as elegant as those should be when viewed from 
-      source point of view. Also trace entries are left in the 
-      code, though under DEBUG mode, which will be cleaned once 
+    ; NOTE: I am not from C or C++ background at all, so some things
+      may not be as elegant as those should be when viewed from
+      source point of view. Also trace entries are left in the
+      code, though under DEBUG mode, which will be cleaned once
      code settles down.

 2012-06-07 00:43 UTC+0200 Viktor Szakats (harbour syenar.net)
@@ -322,7 +339,7 @@
 2012-06-05 14:17 UTC+0200 Viktor Szakats (harbour syenar.net)
  * utils/hbmk2/hbmk2.prg
    + added extra protection to not delete the VCS revision
-      information when it already exist but current VCS revision
+      information when it already exist buts current VCS revision
      extraction command didn't return any results. This often
      happens with new SVN 1.7.5, which fails with internal sqlite
      error nearly always unless 'svn cleanup' is issued.
--- a/harbour/contrib/hbrun/headers.prg
+++ b/harbour/contrib/hbrun/headers.prg
@@ -87,6 +87,7 @@ FUNCTION __hbrun_CoreHeaderFiles()
      ADD HEADER TO s_hHeaders FILE "hbgfx.ch"
      ADD HEADER TO s_hHeaders FILE "hbgfxdef.ch"
      ADD HEADER TO s_hHeaders FILE "hbgtinfo.ch"
+      ADD HEADER TO s_hHeaders FILE "hbhash.ch"
      ADD HEADER TO s_hHeaders FILE "hbhrb.ch"
      ADD HEADER TO s_hHeaders FILE "hbinkey.ch"
      ADD HEADER TO s_hHeaders FILE "hblang.ch"
--- a/harbour/include/Makefile
+++ b/harbour/include/Makefile
@@ -116,6 +116,7 @@ PRG_HEADERS := \
   hbgfx.ch \
   hbgfxdef.ch \
   hbgtinfo.ch \
+   hbhash.ch \
   hbhrb.ch \
   hbinkey.ch \
   hblang.ch \
--- a/harbour/include/common.ch
+++ b/harbour/include/common.ch
@@ -53,6 +53,10 @@
 #ifndef HB_COMMON_CH_
 #define HB_COMMON_CH_

+#if defined( HB_LEGACY_LEVEL4 )
+#  include "hbhash.ch"
+#endif
+
 /* Friendly logical aliases */
 #define TRUE                    .T.
 #define FALSE                   .F.
@@ -78,17 +82,4 @@
 #command UPDATE <v1> IF <exp> TO <v2> => ;
                                IF <exp> ; <v1> := <v2> ; END

-/* HASH autoadd options */
-#define HB_HAUTOADD_NEVER       0x00
-#define HB_HAUTOADD_ACCESS      0x01
-#define HB_HAUTOADD_ASSIGN      0x02
-#define HB_HAUTOADD_ALWAYS      ( HB_HAUTOADD_ACCESS + HB_HAUTOADD_ASSIGN )
-#define HB_HAUTOADD_REFERENCE   HB_HAUTOADD_ALWAYS
-
-/* HB_HMERGE() modes */
-#define HB_HMERGE_UNION         0  /* logical OR  on items in two hash tables (default) */
-#define HB_HMERGE_INTERSECT     1  /* logical AND on items in two hash tables */
-#define HB_HMERGE_DIFFERENCE    2  /* logical XOR on items in two hash tables */
-#define HB_HMERGE_REMOVE        3  /* h1 & ( h1 ^ h2 ) */
-
 #endif /* HB_COMMON_CH_ */
--- a/harbour/include/hbhash.ch
+++ b/harbour/include/hbhash.ch
@@ -0,0 +1,69 @@
+/*
+ * $Id$
+ */
+
+/*
+ * Harbour Project source code:
+ * Header file for hash constants
+ *
+ * Copyright 1999 {list of individual authors and e-mail addresses}
+ * www - http://harbour-project.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this software; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/).
+ *
+ * As a special exception, the Harbour Project gives permission for
+ * additional uses of the text contained in its release of Harbour.
+ *
+ * The exception is that, if you link the Harbour libraries with other
+ * files to produce an executable, this does not by itself cause the
+ * resulting executable to be covered by the GNU General Public License.
+ * Your use of that executable is in no way restricted on account of
+ * linking the Harbour library code into it.
+ *
+ * This exception does not however invalidate any other reasons why
+ * the executable file might be covered by the GNU General Public License.
+ *
+ * This exception applies only to the code released by the Harbour
+ * Project under the name Harbour.  If you copy code from other
+ * Harbour Project or Free Software Foundation releases into a copy of
+ * Harbour, as the General Public License permits, the exception does
+ * not apply to the code that you add in this way.  To avoid misleading
+ * anyone as to the status of such modified files, you must delete
+ * this exception notice from them.
+ *
+ * If you write modifications of your own for Harbour, it is your choice
+ * whether to permit this exception to apply to your modifications.
+ * If you do not wish that, delete this exception notice.
+ *
+ */
+
+#ifndef HB_HASH_CH_
+#define HB_HASH_CH_
+
+/* HASH autoadd options */
+#define HB_HAUTOADD_NEVER       0x00
+#define HB_HAUTOADD_ACCESS      0x01
+#define HB_HAUTOADD_ASSIGN      0x02
+#define HB_HAUTOADD_ALWAYS      ( HB_HAUTOADD_ACCESS + HB_HAUTOADD_ASSIGN )
+#define HB_HAUTOADD_REFERENCE   HB_HAUTOADD_ALWAYS
+
+/* HB_HMERGE() modes */
+#define HB_HMERGE_UNION         0  /* logical OR  on items in two hash tables (default) */
+#define HB_HMERGE_INTERSECT     1  /* logical AND on items in two hash tables */
+#define HB_HMERGE_DIFFERENCE    2  /* logical XOR on items in two hash tables */
+#define HB_HMERGE_REMOVE        3  /* h1 & ( h1 ^ h2 ) */
+
+#endif /* HB_HASH_CH_ */
--- a/harbour/src/rdd/hbsix/sxini.prg
+++ b/harbour/src/rdd/hbsix/sxini.prg
@@ -52,8 +52,9 @@
 *
 */

-#include "common.ch"
 #include "dbinfo.ch"
+
+#include "hbhash.ch"
 #include "hbsxdef.ch"

 #define HB_SIX_SECTION "SXKEYWORDS"
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -12058,6 +12058,7 @@ STATIC FUNCTION hbmk_CoreHeaderFilesMinimal()
      ADD HEADER TO s_hHeaders FILE "directry.ch"
      ADD HEADER TO s_hHeaders FILE "error.ch"
      ADD HEADER TO s_hHeaders FILE "fileio.ch"
+      ADD HEADER TO s_hHeaders FILE "hbhash.ch"
      ADD HEADER TO s_hHeaders FILE "hbmemory.ch"
      ADD HEADER TO s_hHeaders FILE "hbver.ch"
      ADD HEADER TO s_hHeaders FILE "inkey.ch"