Author: kgiusti
Date: Wed Mar 21 13:07:43 2012
New Revision: 1303381
URL: http://svn.apache.org/viewvc?rev=1303381&view=rev
Log:
QPID-3899: fix namespace specifier
Modified:
qpid/trunk/qpid/cpp/src/qpid/broker/MessageGroupManager.cpp
qpid/trunk/qpid/cpp/src/qpid/broker/MessageGroupManager.h
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/MessageGroupManager.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/MessageGroupManager.cpp?rev=1303381&r1=1303380&r2=1303381&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/MessageGroupManager.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/MessageGroupManager.cpp Wed Mar 21
13:07:43 2012
@@ -45,7 +45,7 @@ const std::string MessageGroupManager::q
/** 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);
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/MessageGroupManager.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/MessageGroupManager.h?rev=1303381&r1=1303380&r2=1303381&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/MessageGroupManager.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/MessageGroupManager.h Wed Mar 21
13:07:43 2012
@@ -48,10 +48,10 @@ class MessageGroupManager : public State
// 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 State
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
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
