CVS commit: pkgsrc/databases/gigabase

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Fri Mar 20 20:45:46 UTC 2020

Modified Files:
        pkgsrc/databases/gigabase: distinfo
Added Files:
        pkgsrc/databases/gigabase/patches: patch-query.h patch-testddl.cpp
            patch-testtimeseries.cpp

Log Message:
Fix portability by explicit casts to resolve ambiguity. Don't
reimplement standard C functions.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/databases/gigabase/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/databases/gigabase/patches/patch-query.h \
    pkgsrc/databases/gigabase/patches/patch-testddl.cpp \
    pkgsrc/databases/gigabase/patches/patch-testtimeseries.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/gigabase/distinfo
diff -u pkgsrc/databases/gigabase/distinfo:1.4 pkgsrc/databases/gigabase/distinfo:1.5
--- pkgsrc/databases/gigabase/distinfo:1.4      Tue Nov  3 01:56:11 2015
+++ pkgsrc/databases/gigabase/distinfo  Fri Mar 20 20:45:46 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2015/11/03 01:56:11 agc Exp $
+$NetBSD: distinfo,v 1.5 2020/03/20 20:45:46 joerg Exp $
 
 SHA1 (gigabase-3.82.tar.gz) = b90a4b14f441fb80260bf7f2e332ef4a4e9e736f
 RMD160 (gigabase-3.82.tar.gz) = 91f4ec9318e64e861982cf3fb8031d27bc1e8e80
@@ -6,3 +6,6 @@ SHA512 (gigabase-3.82.tar.gz) = 2f5585e2
 Size (gigabase-3.82.tar.gz) = 1746054 bytes
 SHA1 (patch-aa) = b36dceea6f9c69e7b315923bea7e3bbf377607c8
 SHA1 (patch-class.h) = 86f10c351d52b562bf5e311110a1547140e2284d
+SHA1 (patch-query.h) = 44b50ad53c389bf8f6473738b118b3551b057c81
+SHA1 (patch-testddl.cpp) = d42f3bf7b4b120c97500b045a3eea811d5239b3e
+SHA1 (patch-testtimeseries.cpp) = 11f8dc2f31a5b0b71ae76b900f9aeaf3ff63fd90

Added files:

Index: pkgsrc/databases/gigabase/patches/patch-query.h
diff -u /dev/null pkgsrc/databases/gigabase/patches/patch-query.h:1.1
--- /dev/null   Fri Mar 20 20:45:46 2020
+++ pkgsrc/databases/gigabase/patches/patch-query.h     Fri Mar 20 20:45:46 2020
@@ -0,0 +1,12 @@
+$NetBSD: patch-query.h,v 1.1 2020/03/20 20:45:46 joerg Exp $
+
+--- query.h.orig       2020-03-20 18:58:57.685093966 +0000
++++ query.h
+@@ -710,6 +710,7 @@ inline dbQuery& add(dbQuery& query, dbAr
+ #endif
+ 
+ #define USER_FUNC(f) static dbUserFunction f##_descriptor(&f, STRLITERAL(#f))
++#define USER_FUNC2(f,g) static dbUserFunction f##_descriptor(g, STRLITERAL(#f))
+ 
+ class  dbInheritedAttribute;
+ class  dbSynthesizedAttribute;
Index: pkgsrc/databases/gigabase/patches/patch-testddl.cpp
diff -u /dev/null pkgsrc/databases/gigabase/patches/patch-testddl.cpp:1.1
--- /dev/null   Fri Mar 20 20:45:46 2020
+++ pkgsrc/databases/gigabase/patches/patch-testddl.cpp Fri Mar 20 20:45:46 2020
@@ -0,0 +1,15 @@
+$NetBSD: patch-testddl.cpp,v 1.1 2020/03/20 20:45:46 joerg Exp $
+
+--- testddl.cpp.orig   2020-03-20 18:59:33.126845571 +0000
++++ testddl.cpp
+@@ -102,8 +102,8 @@ class Record : public Base {
+ 
+ REGISTER(Record);
+ 
+-USER_FUNC(sin);
+-USER_FUNC(cos);
++USER_FUNC2(sin, (real8(*)(real8))(cos));
++USER_FUNC2(cos, (real8(*)(real8))(sin));
+ 
+ int __cdecl main()
+ {
Index: pkgsrc/databases/gigabase/patches/patch-testtimeseries.cpp
diff -u /dev/null pkgsrc/databases/gigabase/patches/patch-testtimeseries.cpp:1.1
--- /dev/null   Fri Mar 20 20:45:46 2020
+++ pkgsrc/databases/gigabase/patches/patch-testtimeseries.cpp  Fri Mar 20 20:45:46 2020
@@ -0,0 +1,13 @@
+$NetBSD: patch-testtimeseries.cpp,v 1.1 2020/03/20 20:45:46 joerg Exp $
+
+--- testtimeseries.cpp.orig    2020-03-20 19:03:40.088638131 +0000
++++ testtimeseries.cpp
+@@ -47,8 +47,6 @@ REGISTER_TEMPLATE(DailyBlock);
+ REGISTER(Stock);
+ 
+ inline int random(unsigned mod) { return rand() % mod; }
+-inline float fmax(float x, float y) { return x > y ? x : y; }
+-inline float fmin(float x, float y) { return x < y ? x : y; }
+ 
+ int main(int argc, char* argv[])
+ {