diff options
| author | Jonathan Robie <jonathan@apache.org> | 2010-03-08 22:20:55 +0000 |
|---|---|---|
| committer | Jonathan Robie <jonathan@apache.org> | 2010-03-08 22:20:55 +0000 |
| commit | ab3d6beaef9890a5c16b3f6c2c18298ec84310ac (patch) | |
| tree | a7dc63bdc22c28de0d964339b31cf0b9909103b4 /qpid/cpp | |
| parent | b8e1d492c8ecab1a9e082f835aa11f82ffbada00 (diff) | |
| download | qpid-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')
| -rw-r--r-- | qpid/cpp/configure.ac | 4 | ||||
| -rw-r--r-- | qpid/cpp/src/qpid/xml/XmlExchange.cpp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/qpid/cpp/configure.ac b/qpid/cpp/configure.ac index fee657e0b0..efa38d021f 100644 --- a/qpid/cpp/configure.ac +++ b/qpid/cpp/configure.ac @@ -370,8 +370,8 @@ if test $use_xml != no; then # Check to see if we need to use legacy calls for effective boolean value xqilla_has_ebv=yes AC_CHECK_HEADER([xqilla/ast/XQEffectiveBooleanValue.hpp], , [xqilla_has_ebv=no]) - test $xqilla_has_ebv = no && - AC_DEFINE([XQILLA_2_1_3], [1], [Use the old XQilla 2.1.3 API to get effective boolean value.]) + test $xqilla_has_ebv = yes && + AC_DEFINE([XQ_EFFECTIVE_BOOLEAN_VALUE_HPP], [1], [XQilla version has xqilla/ast/XQEffectiveBooleanValue.hpp.]) fi 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 } |