diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2009-07-16 06:33:46 +0000 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2009-07-16 06:33:46 +0000 |
| commit | de160e2c001fc77168ff1edc815ceeec0c6d4244 (patch) | |
| tree | 15afc931e1e23706b8916619581ddd5c0bcedcee /src/backend/tsearch/ts_selfuncs.c | |
| parent | 4ef8dc7a75a9a408b34338854dd0d412ea01c504 (diff) | |
| download | postgresql-de160e2c001fc77168ff1edc815ceeec0c6d4244.tar.gz | |
Make backend header files C++ safe
This alters various incidental uses of C++ key words to use other similar
identifiers, so that a C++ compiler won't choke outright. You still
(probably) need extern "C" { }; around the inclusion of backend headers.
based on a patch by Kurt Harriman <harriman@acm.org>
Also add a script cpluspluscheck to check for C++ compatibility in the
future. As of right now, this passes without error for me.
Diffstat (limited to 'src/backend/tsearch/ts_selfuncs.c')
| -rw-r--r-- | src/backend/tsearch/ts_selfuncs.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/backend/tsearch/ts_selfuncs.c b/src/backend/tsearch/ts_selfuncs.c index d0ffb0c773..c0e7012b6a 100644 --- a/src/backend/tsearch/ts_selfuncs.c +++ b/src/backend/tsearch/ts_selfuncs.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/tsearch/ts_selfuncs.c,v 1.4 2009/06/11 14:49:03 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/tsearch/ts_selfuncs.c,v 1.5 2009/07/16 06:33:44 petere Exp $ * *------------------------------------------------------------------------- */ @@ -307,7 +307,7 @@ tsquery_opr_selec(QueryItem *item, char *operand, } /* Current TSQuery node is an operator */ - switch (item->operator.oper) + switch (item->qoperator.oper) { case OP_NOT: selec = 1.0 - tsquery_opr_selec(item + 1, operand, @@ -317,7 +317,7 @@ tsquery_opr_selec(QueryItem *item, char *operand, case OP_AND: s1 = tsquery_opr_selec(item + 1, operand, lookup, length, minfreq); - s2 = tsquery_opr_selec(item + item->operator.left, operand, + s2 = tsquery_opr_selec(item + item->qoperator.left, operand, lookup, length, minfreq); selec = s1 * s2; break; @@ -325,13 +325,13 @@ tsquery_opr_selec(QueryItem *item, char *operand, case OP_OR: s1 = tsquery_opr_selec(item + 1, operand, lookup, length, minfreq); - s2 = tsquery_opr_selec(item + item->operator.left, operand, + s2 = tsquery_opr_selec(item + item->qoperator.left, operand, lookup, length, minfreq); selec = s1 + s2 - s1 * s2; break; default: - elog(ERROR, "unrecognized operator: %d", item->operator.oper); + elog(ERROR, "unrecognized operator: %d", item->qoperator.oper); selec = 0; /* keep compiler quiet */ break; } |