diff options
| author | joerg <joerg> | 2012-06-25 11:16:00 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2012-06-25 11:16:00 +0000 |
| commit | 4a606ca91f5ad37ca0d6d6f4fd8dacc58066990c (patch) | |
| tree | 4e8cb38e63b6e19e62c32215ea794c299aaa86be /databases/gigabase | |
| parent | 760c244eb4b8759e01dfc94dad77c5479bde9add (diff) | |
| download | pkgsrc-4a606ca91f5ad37ca0d6d6f4fd8dacc58066990c.tar.gz | |
Request explicit template specialisation before doing it implicitly to
fix build with clang.
Diffstat (limited to 'databases/gigabase')
| -rw-r--r-- | databases/gigabase/distinfo | 3 | ||||
| -rw-r--r-- | databases/gigabase/patches/patch-class.h | 23 |
2 files changed, 25 insertions, 1 deletions
diff --git a/databases/gigabase/distinfo b/databases/gigabase/distinfo index c140dd42d00..77239e436d1 100644 --- a/databases/gigabase/distinfo +++ b/databases/gigabase/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.2 2011/06/18 02:45:13 obache Exp $ +$NetBSD: distinfo,v 1.3 2012/06/25 11:16:00 joerg Exp $ SHA1 (gigabase-3.82.tar.gz) = b90a4b14f441fb80260bf7f2e332ef4a4e9e736f RMD160 (gigabase-3.82.tar.gz) = 91f4ec9318e64e861982cf3fb8031d27bc1e8e80 Size (gigabase-3.82.tar.gz) = 1746054 bytes SHA1 (patch-aa) = b36dceea6f9c69e7b315923bea7e3bbf377607c8 +SHA1 (patch-class.h) = 86f10c351d52b562bf5e311110a1547140e2284d diff --git a/databases/gigabase/patches/patch-class.h b/databases/gigabase/patches/patch-class.h new file mode 100644 index 00000000000..86a111bf10e --- /dev/null +++ b/databases/gigabase/patches/patch-class.h @@ -0,0 +1,23 @@ +$NetBSD: patch-class.h,v 1.1 2012/06/25 11:16:00 joerg Exp $ + +Explicit template specialisation before implicit one. + +--- class.h.orig 2012-06-23 16:32:11.000000000 +0000 ++++ class.h +@@ -216,12 +216,12 @@ typedef int (*dbUDTComparator)(void*, vo + &dbDescribeComponentsOf##table) + + #define REGISTER_TEMPLATE_IN(table, database) \ +- GET_TABLE_DESC_PREFIX GB_NS::dbTableDescriptor* dbGetTableDescriptor GET_TABLE_DESC_PARAM(table) \ +- { return &table::dbDescriptor; } \ + static GB_NS::dbFieldDescriptor* dbDescribeComponentsOf##table() \ +- { return ((table*)0)->dbDescribeComponents(NULL); } \ ++ { return ((table*)0)->dbDescribeComponents(NULL); } \ + TABLE_DESC_PREFIX GB_NS::dbTableDescriptor table::dbDescriptor(_T(#table), database, sizeof(table), \ +- &dbDescribeComponentsOf##table) ++ &dbDescribeComponentsOf##table); \ ++ GET_TABLE_DESC_PREFIX GB_NS::dbTableDescriptor* dbGetTableDescriptor GET_TABLE_DESC_PARAM(table) \ ++ { return &table::dbDescriptor; } \ + + #define REGISTER_IN_NS(ns, table, database) \ + GET_TABLE_DESC_PREFIX GB_NS::dbTableDescriptor* dbGetTableDescriptor GET_TABLE_DESC_PARAM(ns::table) \ |