diff options
| author | Gordon Sim <gsim@apache.org> | 2007-05-30 07:18:04 +0000 |
|---|---|---|
| committer | Gordon Sim <gsim@apache.org> | 2007-05-30 07:18:04 +0000 |
| commit | 29a990c7329141745aba691f145156fa8ba3c462 (patch) | |
| tree | 72b13b88f80503ceb80b1aa197f14a6172c0ab4c /qpid/cpp/src | |
| parent | d443832a64f06bf2542ca5dab1978c73981b0b9e (diff) | |
| download | qpid-python-29a990c7329141745aba691f145156fa8ba3c462.tar.gz | |
Include new dtx classes in generated code.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@542768 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src')
| -rwxr-xr-x | qpid/cpp/src/generate.sh | 2 | ||||
| -rw-r--r-- | qpid/cpp/src/qpid/broker/DtxHandlerImpl.h | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/qpid/cpp/src/generate.sh b/qpid/cpp/src/generate.sh index 8614481ad0..40bf3373d6 100755 --- a/qpid/cpp/src/generate.sh +++ b/qpid/cpp/src/generate.sh @@ -7,7 +7,7 @@ set -e 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 ; diff --git a/qpid/cpp/src/qpid/broker/DtxHandlerImpl.h b/qpid/cpp/src/qpid/broker/DtxHandlerImpl.h index 368ffddbab..f8669bc2b9 100644 --- a/qpid/cpp/src/qpid/broker/DtxHandlerImpl.h +++ b/qpid/cpp/src/qpid/broker/DtxHandlerImpl.h @@ -32,8 +32,8 @@ class DtxDemarcationHandler{}; 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); @@ -61,9 +61,6 @@ public: 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, const std::string& xid ); |