database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-28 23:42:10 +03:00
Code Activity

Make backend header files C++ safe

Browse Source 
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.
This commit is contained in:
Peter Eisentraut
2009-07-16 06:33:46 +00:00
parent 4ef8dc7a75
commit de160e2c00
52 changed files with 392 additions and 359 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/backend/utils/adt/tsquery_cleanup.c
View File

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/adt/tsquery_cleanup.c,v 1.11 2009/01/01 17:23:50 momjian Exp $
* $PostgreSQL: pgsql/src/backend/utils/adt/tsquery_cleanup.c,v 1.12 2009/07/16 06:33:44 petere Exp $
*
*-------------------------------------------------------------------------
*/
@ -39,8 +39,8 @@ maketree(QueryItem *in)
if (in->type == QI_OPR)
{
node->right = maketree(in + 1);
if (in->operator.oper != OP_NOT)
node->left = maketree(in + in->operator.left);
if (in->qoperator.oper != OP_NOT)
node->left = maketree(in + in->qoperator.left);
}
return node;
}
@ -69,9 +69,9 @@ plainnode(PLAINTREE *state, NODE *node)
memcpy((void *) &(state->ptr[state->cur]), (void *) node->valnode, sizeof(QueryItem));
if (node->valnode->type == QI_VAL)
state->cur++;
else if (node->valnode->operator.oper == OP_NOT)
else if (node->valnode->qoperator.oper == OP_NOT)
{
state->ptr[state->cur].operator.left = 1;
state->ptr[state->cur].qoperator.left = 1;
state->cur++;
plainnode(state, node->right);
}
@ -81,7 +81,7 @@ plainnode(PLAINTREE *state, NODE *node)
state->cur++;
plainnode(state, node->right);
state->ptr[cur].operator.left = state->cur - cur;
state->ptr[cur].qoperator.left = state->cur - cur;
plainnode(state, node->left);
}
pfree(node);
@ -138,14 +138,14 @@ clean_NOT_intree(NODE *node)
if (node->valnode->type == QI_VAL)
return node;
if (node->valnode->operator.oper == OP_NOT)
if (node->valnode->qoperator.oper == OP_NOT)
{
freetree(node);
return NULL;
}
/* operator & or | */
if (node->valnode->operator.oper == OP_OR)
if (node->valnode->qoperator.oper == OP_OR)
{
if ((node->left = clean_NOT_intree(node->left)) == NULL ||
(node->right = clean_NOT_intree(node->right)) == NULL)
@ -158,7 +158,7 @@ clean_NOT_intree(NODE *node)
{
NODE *res = node;
Assert(node->valnode->operator.oper == OP_AND);
Assert(node->valnode->qoperator.oper == OP_AND);
node->left = clean_NOT_intree(node->left);
node->right = clean_NOT_intree(node->right);
@ -233,7 +233,7 @@ clean_fakeval_intree(NODE *node, char *result)
Assert(node->valnode->type == QI_OPR);
if (node->valnode->operator.oper == OP_NOT)
if (node->valnode->qoperator.oper == OP_NOT)
{
node->right = clean_fakeval_intree(node->right, &rresult);
if (!node->right)