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/nodes/outfuncs.c | |
| parent | 4ef8dc7a75a9a408b34338854dd0d412ea01c504 (diff) | |
| download | postgresql-de160e2c001fc77168ff1edc815ceeec0c6d4244.tar.gz postgresql-de160e2c001fc77168ff1edc815ceeec0c6d4244.zip | |
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/nodes/outfuncs.c')
| -rw-r--r-- | src/backend/nodes/outfuncs.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/backend/nodes/outfuncs.c b/src/backend/nodes/outfuncs.c index d79bd750d04..4e808a5868e 100644 --- a/src/backend/nodes/outfuncs.c +++ b/src/backend/nodes/outfuncs.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/nodes/outfuncs.c,v 1.360 2009/06/11 14:48:58 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/nodes/outfuncs.c,v 1.361 2009/07/16 06:33:42 petere Exp $ * * NOTES * Every node type that can appear in stored rules' parsetrees *must* @@ -1259,7 +1259,7 @@ _outJoinExpr(StringInfo str, JoinExpr *node) WRITE_BOOL_FIELD(isNatural); WRITE_NODE_FIELD(larg); WRITE_NODE_FIELD(rarg); - WRITE_NODE_FIELD(using); + WRITE_NODE_FIELD(usingClause); WRITE_NODE_FIELD(quals); WRITE_NODE_FIELD(alias); WRITE_INT_FIELD(rtindex); @@ -1822,7 +1822,7 @@ _outXmlSerialize(StringInfo str, XmlSerialize *node) WRITE_ENUM_FIELD(xmloption, XmlOptionType); WRITE_NODE_FIELD(expr); - WRITE_NODE_FIELD(typename); + WRITE_NODE_FIELD(typeName); WRITE_LOCATION_FIELD(location); } @@ -1832,7 +1832,7 @@ _outColumnDef(StringInfo str, ColumnDef *node) WRITE_NODE_TYPE("COLUMNDEF"); WRITE_STRING_FIELD(colname); - WRITE_NODE_FIELD(typename); + WRITE_NODE_FIELD(typeName); WRITE_INT_FIELD(inhcount); WRITE_BOOL_FIELD(is_local); WRITE_BOOL_FIELD(is_not_null); @@ -1847,7 +1847,7 @@ _outTypeName(StringInfo str, TypeName *node) WRITE_NODE_TYPE("TYPENAME"); WRITE_NODE_FIELD(names); - WRITE_OID_FIELD(typeid); + WRITE_OID_FIELD(typeOid); WRITE_BOOL_FIELD(setof); WRITE_BOOL_FIELD(pct_type); WRITE_NODE_FIELD(typmods); @@ -1862,7 +1862,7 @@ _outTypeCast(StringInfo str, TypeCast *node) WRITE_NODE_TYPE("TYPECAST"); WRITE_NODE_FIELD(arg); - WRITE_NODE_FIELD(typename); + WRITE_NODE_FIELD(typeName); WRITE_LOCATION_FIELD(location); } |