You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by jo...@apache.org on 2010/03/08 23:20:55 UTC
svn commit: r920545 - in /qpid/trunk/qpid/cpp: configure.ac
src/qpid/xml/XmlExchange.cpp
Author: jonathan
Date: Mon Mar 8 22:20:55 2010
New Revision: 920545
URL: http://svn.apache.org/viewvc?rev=920545&view=rev
Log:
Changed name of XQilla EBV define to XQ_EXTENDED_BOOLEAN_VALUE_HPP.
Modified:
qpid/trunk/qpid/cpp/configure.ac
qpid/trunk/qpid/cpp/src/qpid/xml/XmlExchange.cpp
Modified: qpid/trunk/qpid/cpp/configure.ac
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/configure.ac?rev=920545&r1=920544&r2=920545&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/configure.ac (original)
+++ qpid/trunk/qpid/cpp/configure.ac Mon Mar 8 22:20:55 2010
@@ -370,8 +370,8 @@
# 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
Modified: qpid/trunk/qpid/cpp/src/qpid/xml/XmlExchange.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/xml/XmlExchange.cpp?rev=920545&r1=920544&r2=920545&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/xml/XmlExchange.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/xml/XmlExchange.cpp Mon Mar 8 22:20:55 2010
@@ -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 @@
}
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
}
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org