From de160e2c001fc77168ff1edc815ceeec0c6d4244 Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <peter_e@gmx.net>
Date: Thu, 16 Jul 2009 06:33:46 +0000
Subject: 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.
---
 src/tools/pginclude/cpluspluscheck | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 src/tools/pginclude/cpluspluscheck

(limited to 'src/tools/pginclude/cpluspluscheck')

diff --git a/src/tools/pginclude/cpluspluscheck b/src/tools/pginclude/cpluspluscheck
new file mode 100644
index 0000000000..f266fea24b
--- /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
-- 
cgit v1.2.1