diff options
| author | Kenneth Anthony Giusti <kgiusti@apache.org> | 2012-03-21 13:07:43 +0000 |
|---|---|---|
| committer | Kenneth Anthony Giusti <kgiusti@apache.org> | 2012-03-21 13:07:43 +0000 |
| commit | 50fd1af4605e8cfd14b272e596ce2e6e146642e3 (patch) | |
| tree | e18ef9273906b0aa3dc9e9ef596a6c46a23ca527 | |
| parent | 849d717c0357e28099e763aa98af19807e927ba8 (diff) | |
| download | qpid-python-50fd1af4605e8cfd14b272e596ce2e6e146642e3.tar.gz | |
QPID-3899: fix namespace specifier
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1303381 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/cpp/src/qpid/broker/MessageGroupManager.cpp | 2 | ||||
| -rw-r--r-- | qpid/cpp/src/qpid/broker/MessageGroupManager.h | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/qpid/cpp/src/qpid/broker/MessageGroupManager.cpp b/qpid/cpp/src/qpid/broker/MessageGroupManager.cpp index 98313e74ad..22253532cb 100644 --- a/qpid/cpp/src/qpid/broker/MessageGroupManager.cpp +++ b/qpid/cpp/src/qpid/broker/MessageGroupManager.cpp @@ -45,7 +45,7 @@ const std::string MessageGroupManager::qpidMessageGroupTimestamp("qpid.group_tim /** return an iterator to the message at position, or members.end() if not found */ MessageGroupManager::GroupState::MessageFifo::iterator -MessageGroupManager::GroupState::findMsg(const framing::SequenceNumber &position) +MessageGroupManager::GroupState::findMsg(const qpid::framing::SequenceNumber &position) { MessageState mState(position); MessageFifo::iterator found = std::lower_bound(members.begin(), members.end(), mState); diff --git a/qpid/cpp/src/qpid/broker/MessageGroupManager.h b/qpid/cpp/src/qpid/broker/MessageGroupManager.h index a998370bbe..66c3d9ab5d 100644 --- a/qpid/cpp/src/qpid/broker/MessageGroupManager.h +++ b/qpid/cpp/src/qpid/broker/MessageGroupManager.h @@ -48,10 +48,10 @@ class MessageGroupManager : public StatefulQueueObserver, public MessageDistribu // track which messages are in this group, and if they have been acquired struct MessageState { - framing::SequenceNumber position; + qpid::framing::SequenceNumber position; bool acquired; MessageState() : acquired(false) {} - MessageState(const framing::SequenceNumber& p) : position(p), acquired(false) {} + MessageState(const qpid::framing::SequenceNumber& p) : position(p), acquired(false) {} bool operator<(const MessageState& b) { return position < b.position; } }; typedef std::deque<MessageState> MessageFifo; @@ -63,11 +63,11 @@ class MessageGroupManager : public StatefulQueueObserver, public MessageDistribu GroupState() : acquired(0) {} bool owned() const {return !owner.empty();} - MessageFifo::iterator findMsg(const framing::SequenceNumber &); + MessageFifo::iterator findMsg(const qpid::framing::SequenceNumber &); }; typedef sys::unordered_map<std::string, struct GroupState> GroupMap; - typedef std::map<framing::SequenceNumber, struct GroupState *> GroupFifo; + typedef std::map<qpid::framing::SequenceNumber, struct GroupState *> GroupFifo; GroupMap messageGroups; // index: group name GroupFifo freeGroups; // ordered by oldest free msg |