summaryrefslogtreecommitdiff
path: root/qpid/cpp/src
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
commitab3d6beaef9890a5c16b3f6c2c18298ec84310ac (patch)
treea7dc63bdc22c28de0d964339b31cf0b9909103b4 /qpid/cpp/src
parentb8e1d492c8ecab1a9e082f835aa11f82ffbada00 (diff)
downloadqpid-python-ab3d6beaef9890a5c16b3f6c2c18298ec84310ac.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@920545 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src')
-rw-r--r--qpid/cpp/src/qpid/xml/XmlExchange.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/qpid/cpp/src/qpid/xml/XmlExchange.cpp b/qpid/cpp/src/qpid/xml/XmlExchange.cpp
index b62245b6eb..fbf7566a18 100644
--- a/qpid/cpp/src/qpid/xml/XmlExchange.cpp
+++ b/qpid/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
}