summaryrefslogtreecommitdiff
path: root/cpp/src/qpid/xml/XmlExchange.cpp
diff options
context:
space:
mode:
authorJonathan Robie <jonathan@apache.org>2010-03-08 22:20:55 +0000
committerJonathan Robie <jonathan@apache.org>2010-03-08 22:20:55 +0000
commit7342f3bc19028d3734f45cb73fa409dd42214a8a (patch)
tree8adc7bc68ed52a31e4268a37e359609146aa9734 /cpp/src/qpid/xml/XmlExchange.cpp
parent8a9399e46649a8fc84b994a73e2e57af052abc1d (diff)
downloadqpid-python-7342f3bc19028d3734f45cb73fa409dd42214a8a.tar.gz
Changed name of XQilla EBV define to XQ_EXTENDED_BOOLEAN_VALUE_HPP.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@920545 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/xml/XmlExchange.cpp')
-rw-r--r--cpp/src/qpid/xml/XmlExchange.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/qpid/xml/XmlExchange.cpp b/cpp/src/qpid/xml/XmlExchange.cpp
index b62245b6eb..fbf7566a18 100644
--- a/cpp/src/qpid/xml/XmlExchange.cpp
+++ b/cpp/src/qpid/xml/XmlExchange.cpp
@@ -34,7 +34,7 @@
#include <xercesc/framework/MemBufInputSource.hpp>
-#ifndef XQILLA_2_1_3
+#ifdef XQ_EFFECTIVE_BOOLEAN_VALUE_HPP
#include <xqilla/ast/XQEffectiveBooleanValue.hpp>
#endif
@@ -184,11 +184,11 @@ bool XmlExchange::matches(Query& query, Deliverable& msg, const qpid::framing::F
}
Result result = query->execute(context.get());
-#ifndef XQILLA_2_1_3
+#ifdef XQ_EFFECTIVE_BOOLEAN_VALUE_HPP
Item::Ptr first_ = result->next(context.get());
Item::Ptr second_ = result->next(context.get());
return XQEffectiveBooleanValue::get(first_, second_, context.get(), 0);
-#else
+#else
return result->getEffectiveBooleanValue(context.get(), 0);
#endif
}