[BACK]Return to patch-class.h CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / pkgsrc / databases / gigabase / patches

File: [cvs.NetBSD.org] / pkgsrc / databases / gigabase / patches / patch-class.h (download)

Revision 1.1, Mon Jun 25 11:16:00 2012 UTC (8 years, 5 months ago) by joerg
Branch: MAIN
CVS Tags: pkgsrc-2020Q3-base, pkgsrc-2020Q3, pkgsrc-2020Q2-base, pkgsrc-2020Q2, pkgsrc-2020Q1-base, pkgsrc-2020Q1, pkgsrc-2019Q4-base, pkgsrc-2019Q4, pkgsrc-2019Q3-base, pkgsrc-2019Q3, pkgsrc-2019Q2-base, pkgsrc-2019Q2, pkgsrc-2019Q1-base, pkgsrc-2019Q1, pkgsrc-2018Q4-base, pkgsrc-2018Q4, pkgsrc-2018Q3-base, pkgsrc-2018Q3, pkgsrc-2018Q2-base, pkgsrc-2018Q2, pkgsrc-2018Q1-base, pkgsrc-2018Q1, pkgsrc-2017Q4-base, pkgsrc-2017Q4, pkgsrc-2017Q3-base, pkgsrc-2017Q3, pkgsrc-2017Q2-base, pkgsrc-2017Q2, pkgsrc-2017Q1-base, pkgsrc-2017Q1, pkgsrc-2016Q4-base, pkgsrc-2016Q4, pkgsrc-2016Q3-base, pkgsrc-2016Q3, pkgsrc-2016Q2-base, pkgsrc-2016Q2, pkgsrc-2016Q1-base, pkgsrc-2016Q1, pkgsrc-2015Q4-base, pkgsrc-2015Q4, pkgsrc-2015Q3-base, pkgsrc-2015Q3, pkgsrc-2015Q2-base, pkgsrc-2015Q2, pkgsrc-2015Q1-base, pkgsrc-2015Q1, pkgsrc-2014Q4-base, pkgsrc-2014Q4, pkgsrc-2014Q3-base, pkgsrc-2014Q3, pkgsrc-2014Q2-base, pkgsrc-2014Q2, pkgsrc-2014Q1-base, pkgsrc-2014Q1, pkgsrc-2013Q4-base, pkgsrc-2013Q4, pkgsrc-2013Q3-base, pkgsrc-2013Q3, pkgsrc-2013Q2-base, pkgsrc-2013Q2, pkgsrc-2013Q1-base, pkgsrc-2013Q1, pkgsrc-2012Q4-base, pkgsrc-2012Q4, pkgsrc-2012Q3-base, pkgsrc-2012Q3, pkgsrc-2012Q2-base, pkgsrc-2012Q2, HEAD

Request explicit template specialisation before doing it implicitly to
fix build with clang.

$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) \