summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2009-02-02 08:52:44 +0100
committerStefan Metzmacher <metze@samba.org>2009-02-02 13:09:21 +0100
commitbab629426958907e675765ce0620f321dcc5f780 (patch)
treebe2532a4ed8ea95b3a4821e03ab2d8bb1415c571 /source4
parent4bbfdb2ded3b34fe001757c67d6ca617ea781d2e (diff)
downloadsamba-bab629426958907e675765ce0620f321dcc5f780.tar.gz
samba-bab629426958907e675765ce0620f321dcc5f780.tar.bz2
samba-bab629426958907e675765ce0620f321dcc5f780.zip
s4:includes: copy #error DONT_USE_CPLUSPLUS_RESERVED_NAMES from source3
We should not use c++ reserved names in source4 too. metze
Diffstat (limited to 'source4')
-rw-r--r--source4/include/includes.h16
1 files changed, 16 insertions, 0 deletions
diff --git a/source4/include/includes.h b/source4/include/includes.h
index c1c565118d..d9b7759e7e 100644
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -33,6 +33,22 @@
#include "system/time.h"
#include "system/wait.h"
+/* only do the C++ reserved word check when we compile
+ to include --with-developer since too many systems
+ still have comflicts with their header files (e.g. IRIX 6.4) */
+
+#if !defined(__cplusplus) && defined(DEVELOPER)
+#define class #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
+#define private #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
+#define public #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
+#define protected #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
+#define template #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
+#define this #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
+#define new #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
+#define delete #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
+#define friend #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
+#endif
+
/* Lists, trees, caching, database... */
#include <talloc.h>
#ifndef _PRINTF_ATTRIBUTE