Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Eisentraut2009-07-16 06:33:46 +0000
committerPeter Eisentraut2009-07-16 06:33:46 +0000
commitde160e2c001fc77168ff1edc815ceeec0c6d4244 (patch)
tree15afc931e1e23706b8916619581ddd5c0bcedcee /src/tools/pginclude/cpluspluscheck
parent4ef8dc7a75a9a408b34338854dd0d412ea01c504 (diff)
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/tools/pginclude/cpluspluscheck')
-rw-r--r--src/tools/pginclude/cpluspluscheck33
1 files changed, 33 insertions, 0 deletions
diff --git a/src/tools/pginclude/cpluspluscheck b/src/tools/pginclude/cpluspluscheck
new file mode 100644
index 00000000000..f266fea24b0
--- /dev/null
+++ b/src/tools/pginclude/cpluspluscheck
@@ -0,0 +1,33 @@
+#!/bin/sh
+
+# Check all include files in or below the current directory for C++
+# compatibility. Typically, run this in PostgreSQL's src/include/ directory.
+# No output if everything is OK, else compiler errors.
+
+set -e
+
+me=`basename $0`
+
+trap 'rm -rf $tmp' 0 1 2 3 15
+tmp=`mktemp -d /tmp/$me.XXXXXX`
+
+{
+echo ' extern "C" {'
+echo '#include "postgres.h"'
+
+# Omit port/, because it's platform specific, and c.h includes it anyway. Omit
+# regex/ and snowball/, because those files came from elsewhere, and they would
+# need extra work if someone cared to fix them. kwlist.h is not meant to be
+# included directly. rusagestub.h will be included by ./utils/pg_rusage.h if
+# necessary.
+for file in `find . \( -name port -prune -o -name regex -prune -o -name snowball -prune \) -o -name '*.h' -not -name kwlist.h -not -name rusagestub.h -print`; do
+ f=`echo $file | sed 's,^\./,,'`
+ echo "#include \"$f\""
+done
+
+echo '};'
+} >$tmp/test.cpp
+
+# -fno-operator-names omits the definition of bitand and bitor, which would
+# collide with varbit.h. Could be fixed, if one were so inclined.
+${CXX:-g++} -I. -fsyntax-only -fno-operator-names -Wall -c $tmp/test.cpp