summaryrefslogtreecommitdiff
path: root/cpp/src/qpid/client/SessionImpl.cpp
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2008-09-09 14:06:07 +0000
committerAlan Conway <aconway@apache.org>2008-09-09 14:06:07 +0000
commit833cf68a5bf58e882f377d144768ceb546e5e036 (patch)
tree8b2ca57e790956a38c33583970a5c4198b407073 /cpp/src/qpid/client/SessionImpl.cpp
parent7feb5546e82e0d003f26027524ceb07e9b9b0452 (diff)
downloadqpid-python-833cf68a5bf58e882f377d144768ceb546e5e036.tar.gz
Generate c++ enum types for AMQP enums in framing/enum.h.
Modified enum scheme to avoid name clashes: namespace amqp_class { EnumName { ENUM_NAME_X=1, ENUM_NAME_X=2 ...}}; git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@693465 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/client/SessionImpl.cpp')
-rw-r--r--cpp/src/qpid/client/SessionImpl.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/qpid/client/SessionImpl.cpp b/cpp/src/qpid/client/SessionImpl.cpp
index 2075ed04f3..aef546c427 100644
--- a/cpp/src/qpid/client/SessionImpl.cpp
+++ b/cpp/src/qpid/client/SessionImpl.cpp
@@ -26,7 +26,7 @@
#include "qpid/framing/all_method_bodies.h"
#include "qpid/framing/ClientInvoker.h"
-#include "qpid/framing/constants.h"
+#include "qpid/framing/enum.h"
#include "qpid/framing/FrameSet.h"
#include "qpid/framing/MethodContent.h"
#include "qpid/framing/SequenceSet.h"
@@ -41,7 +41,7 @@ namespace qpid {
namespace client {
using namespace qpid::framing;
-using namespace qpid::framing::session;//for detach codes
+using namespace qpid::framing::session; //for detach codes
typedef sys::Monitor::ScopedLock Lock;
typedef sys::Monitor::ScopedUnlock UnLock;
@@ -52,7 +52,7 @@ SessionImpl::SessionImpl(const std::string& name,
shared_ptr<ConnectionImpl> conn,
uint16_t ch, uint64_t _maxFrameSize)
: error(OK),
- code(NORMAL),
+ code(DETACH_CODE_NORMAL),
text(EMPTY),
state(INACTIVE),
detachedLifetime(0),