diff options
| author | Gordon Sim <gsim@apache.org> | 2013-09-02 16:22:24 +0000 |
|---|---|---|
| committer | Gordon Sim <gsim@apache.org> | 2013-09-02 16:22:24 +0000 |
| commit | 27fbcb5efc5af79c6d2bf69409c4ff267c33bc6a (patch) | |
| tree | 4f26a2011b18878c48791f385a66be0c7c5396ad /cpp/src/qpid/amqp/DataBuilder.cpp | |
| parent | f68bb96b236f92fb768438a2c9f315f89ce6a5db (diff) | |
| download | qpid-python-27fbcb5efc5af79c6d2bf69409c4ff267c33bc6a.tar.gz | |
QPID-5106: handle annotations properly and add option to control whether annotations are nested or not on fetch()
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1519466 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/amqp/DataBuilder.cpp')
| -rw-r--r-- | cpp/src/qpid/amqp/DataBuilder.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/qpid/amqp/DataBuilder.cpp b/cpp/src/qpid/amqp/DataBuilder.cpp index 805125eb7f..91c9393457 100644 --- a/cpp/src/qpid/amqp/DataBuilder.cpp +++ b/cpp/src/qpid/amqp/DataBuilder.cpp @@ -158,7 +158,7 @@ bool DataBuilder::nest(const qpid::types::Variant& n) return true; } -bool DataBuilder::onStartList(uint32_t, const CharSequence&, const Descriptor*) +bool DataBuilder::onStartList(uint32_t, const CharSequence&, const CharSequence&, const Descriptor*) { return nest(qpid::types::Variant::List()); } @@ -166,7 +166,7 @@ void DataBuilder::onEndList(uint32_t /*count*/, const Descriptor*) { nested.pop(); } -bool DataBuilder::onStartMap(uint32_t /*count*/, const CharSequence&, const Descriptor*) +bool DataBuilder::onStartMap(uint32_t /*count*/, const CharSequence&, const CharSequence&, const Descriptor*) { return nest(qpid::types::Variant::Map()); } @@ -176,7 +176,7 @@ void DataBuilder::onEndMap(uint32_t /*count*/, const Descriptor*) } bool DataBuilder::onStartArray(uint32_t count, const CharSequence&, const Constructor&, const Descriptor*) { - return onStartList(count, CharSequence::create(), 0); + return onStartList(count, CharSequence::create(), CharSequence::create(), 0); } void DataBuilder::onEndArray(uint32_t count, const Descriptor*) { |