changeset 1645:080d479edd32

[xemacs-hg @ 2003-08-26 14:03:57 by james] Nickolay Pakoulin's patch to make g++ compile database.c without error.
author james
date Tue, 26 Aug 2003 14:04:00 +0000
parents 14a7222dba6d
children 41378245efc2
files src/ChangeLog src/database.c
diffstat 2 files changed, 8 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Mon Aug 25 21:52:27 2003 +0000
+++ b/src/ChangeLog	Tue Aug 26 14:04:00 2003 +0000
@@ -1,3 +1,8 @@
+2003-08-26  Nickolay Pakoulin  <npak@ispras.ru>
+
+	* database.c (berkdb_get):
+	(berkdb_map): Add type casts to satisfy C++ compilers.
+
 2003-08-25  Marcus Crestani  <crestani@informatik.uni-tuebingen.de>
 
 	* alloc.c (kkcc_gc_stack_init):
--- a/src/database.c	Mon Aug 25 21:52:27 2003 +0000
+++ b/src/database.c	Tue Aug 26 14:04:00 2003 +0000
@@ -418,7 +418,7 @@
 #endif /* DB_VERSION_MAJOR */
 
   if (!status)
-    return make_ext_string (valdatum.data, valdatum.size,
+    return make_ext_string ((const Extbyte *) valdatum.data, valdatum.size,
 			    db->coding_system);
 
 #if DB_VERSION_MAJOR == 1
@@ -528,9 +528,9 @@
 	 status == 0;
 	 status = dbcp->c_get (dbcp, &keydatum, &valdatum, DB_NEXT))
       {
-	key = make_ext_string (keydatum.data, keydatum.size,
+	key = make_ext_string ((const Extbyte *) keydatum.data, keydatum.size,
 			       db->coding_system);
-	val = make_ext_string (valdatum.data, valdatum.size,
+	val = make_ext_string ((const Extbyte *) valdatum.data, valdatum.size,
 			       db->coding_system);
 	call2 (func, key, val);
       }