summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2012-09-26 09:18:16 +0200
committerStephan Bergmann <sbergman@redhat.com>2012-09-26 09:18:16 +0200
commiteaf6e2c4fc3f5c20bba56ab830577296278e85ff (patch)
tree93fc877c1b2aea9262784577c29c002e3c63f697
parentAdapt to deprecated rtl/oustringostreaminserter.hxx (diff)
downloadbinfilter-eaf6e2c4fc3f5c20bba56ab830577296278e85ff.tar.gz
binfilter-eaf6e2c4fc3f5c20bba56ab830577296278e85ff.zip
Duplicate EXPLICIT fix for binfilter
cf. core eebc9748d2ea26a7b5af246dba115103d6bb15db "Fix MSVC build: #undef EXPLICIT (which gets defined as 'explicit' somewhere)" Change-Id: I501571d8eb42df97cddd99b1490a49d08b282243
-rw-r--r--binfilter/bf_basic/source/inc/token.hxx4
1 files changed, 4 insertions, 0 deletions
diff --git a/binfilter/bf_basic/source/inc/token.hxx b/binfilter/bf_basic/source/inc/token.hxx
index bc2fc4625..12313b7ff 100644
--- a/binfilter/bf_basic/source/inc/token.hxx
+++ b/binfilter/bf_basic/source/inc/token.hxx
@@ -28,6 +28,10 @@
#undef SHARED
#endif
+#if defined( EXPLICIT )
+#undef EXPLICIT
+#endif
+
namespace binfilter {
// Der Tokenizer ist stand-alone, d.h. er kann von ueberallher verwendet