You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by gs...@apache.org on 2007/05/30 09:18:05 UTC
svn commit: r542768 - in /incubator/qpid/trunk/qpid/cpp/src: generate.sh
qpid/broker/DtxHandlerImpl.h
Author: gsim
Date: Wed May 30 00:18:04 2007
New Revision: 542768
URL: http://svn.apache.org/viewvc?view=rev&rev=542768
Log:
Include new dtx classes in generated code.
Modified:
incubator/qpid/trunk/qpid/cpp/src/generate.sh
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DtxHandlerImpl.h
Modified: incubator/qpid/trunk/qpid/cpp/src/generate.sh
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/generate.sh?view=diff&rev=542768&r1=542767&r2=542768
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/generate.sh (original)
+++ incubator/qpid/trunk/qpid/cpp/src/generate.sh Wed May 30 00:18:04 2007
@@ -7,7 +7,7 @@
gentools_dir="$srcdir/../gentools"
specs_dir="$srcdir/../../specs"
-specs="$specs_dir/amqp.0-9.xml $specs_dir/amqp-errata.0-9.xml"
+specs="$specs_dir/amqp.0-9.xml $specs_dir/amqp-errata.0-9.xml $specs_dir/amqp-dtx-preview.xml"
test -z "$JAVA" && JAVA=java ;
test -z "$JAVAC" && JAVAC=javac ;
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DtxHandlerImpl.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DtxHandlerImpl.h?view=diff&rev=542768&r1=542767&r2=542768
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DtxHandlerImpl.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DtxHandlerImpl.h Wed May 30 00:18:04 2007
@@ -32,8 +32,8 @@
class DtxHandlerImpl
: public CoreRefs,
- public /*framing::AMQP_ServerOperations::*/DtxCoordinationHandler,
- public /*framing::AMQP_ServerOperations::*/DtxDemarcationHandler
+ public framing::AMQP_ServerOperations::DtxCoordinationHandler,
+ public framing::AMQP_ServerOperations::DtxDemarcationHandler
{
public:
DtxHandlerImpl(CoreRefs& parent);
@@ -60,9 +60,6 @@
u_int16_t ticket,
bool startscan,
u_int32_t endscan );
-
- void recoverOk(const framing::MethodContext& context,
- const framing::FieldTable& xids );
void rollback(const framing::MethodContext& context,
u_int16_t ticket,