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/wparser_def.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/wparser_def.c')
| -rw-r--r-- | src/backend/tsearch/wparser_def.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/backend/tsearch/wparser_def.c b/src/backend/tsearch/wparser_def.c index d7d72afddd..3d3409dac6 100644 --- a/src/backend/tsearch/wparser_def.c +++ b/src/backend/tsearch/wparser_def.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/tsearch/wparser_def.c,v 1.23 2009/03/11 16:03:40 teodor Exp $ + * $PostgreSQL: pgsql/src/backend/tsearch/wparser_def.c,v 1.24 2009/07/16 06:33:44 petere Exp $ * *------------------------------------------------------------------------- */ @@ -1950,7 +1950,7 @@ hlCover(HeadlineParsedText *prs, TSQuery query, int *p, int *q) } for (i = pos; i < prs->curwords; i++) { - if (prs->words[i].item == &item->operand) + if (prs->words[i].item == &item->qoperand) { if (i > *q) *q = i; @@ -1973,7 +1973,7 @@ hlCover(HeadlineParsedText *prs, TSQuery query, int *p, int *q) } for (i = *q; i >= pos; i--) { - if (prs->words[i].item == &item->operand) + if (prs->words[i].item == &item->qoperand) { if (i < *p) *p = i; |