mirror of
https://github.com/postgres/postgres.git
synced 2025-06-16 06:01:02 +03:00
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.
This commit is contained in:
@ -8,7 +8,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $PostgreSQL: pgsql/src/backend/parser/parse_expr.c,v 1.241 2009/06/11 14:49:00 momjian Exp $
|
||||
* $PostgreSQL: pgsql/src/backend/parser/parse_expr.c,v 1.242 2009/07/16 06:33:43 petere Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@ -159,7 +159,7 @@ transformExpr(ParseState *pstate, Node *expr)
|
||||
Oid elementType;
|
||||
int32 targetTypmod;
|
||||
|
||||
targetType = typenameTypeId(pstate, tc->typename,
|
||||
targetType = typenameTypeId(pstate, tc->typeName,
|
||||
&targetTypmod);
|
||||
elementType = get_element_type(targetType);
|
||||
if (OidIsValid(elementType))
|
||||
@ -1773,7 +1773,7 @@ transformXmlSerialize(ParseState *pstate, XmlSerialize *xs)
|
||||
XMLOID,
|
||||
"XMLSERIALIZE"));
|
||||
|
||||
targetType = typenameTypeId(pstate, xs->typename, &targetTypmod);
|
||||
targetType = typenameTypeId(pstate, xs->typeName, &targetTypmod);
|
||||
|
||||
xexpr->xmloption = xs->xmloption;
|
||||
xexpr->location = xs->location;
|
||||
@ -2000,7 +2000,7 @@ transformTypeCast(ParseState *pstate, TypeCast *tc)
|
||||
int32 targetTypmod;
|
||||
int location;
|
||||
|
||||
targetType = typenameTypeId(pstate, tc->typename, &targetTypmod);
|
||||
targetType = typenameTypeId(pstate, tc->typeName, &targetTypmod);
|
||||
|
||||
if (inputType == InvalidOid)
|
||||
return expr; /* do nothing if NULL input */
|
||||
@ -2012,7 +2012,7 @@ transformTypeCast(ParseState *pstate, TypeCast *tc)
|
||||
*/
|
||||
location = tc->location;
|
||||
if (location < 0)
|
||||
location = tc->typename->location;
|
||||
location = tc->typeName->location;
|
||||
|
||||
result = coerce_to_target_type(pstate, expr, inputType,
|
||||
targetType, targetTypmod,
|
||||
|
Reference in New Issue
Block a user