diff options
author | Gordon Sim <gsim@apache.org> | 2012-08-28 13:16:59 +0000 |
---|---|---|
committer | Gordon Sim <gsim@apache.org> | 2012-08-28 13:16:59 +0000 |
commit | e53bd0e61a96a7320c099ed4a9695d0def4bdd01 (patch) | |
tree | 1f2672e0222009fdca72deff796cb6eb568d967e /qpid/cpp/src/qpid/amqp_0_10 | |
parent | 53fb8313228ea4adbc1609cb7cd20aebaad29790 (diff) | |
download | qpid-python-e53bd0e61a96a7320c099ed4a9695d0def4bdd01.tar.gz |
NO-JIRA: Remove const qualifier from encode buffer (can't encode into if it is const, and impls const cast it anyway)
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1378125 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/qpid/amqp_0_10')
-rw-r--r-- | qpid/cpp/src/qpid/amqp_0_10/Connection.cpp | 4 | ||||
-rw-r--r-- | qpid/cpp/src/qpid/amqp_0_10/Connection.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/qpid/cpp/src/qpid/amqp_0_10/Connection.cpp b/qpid/cpp/src/qpid/amqp_0_10/Connection.cpp index ceeaadf70c..8cb675202e 100644 --- a/qpid/cpp/src/qpid/amqp_0_10/Connection.cpp +++ b/qpid/cpp/src/qpid/amqp_0_10/Connection.cpp @@ -74,14 +74,14 @@ bool Connection::isClosed() const { return pushClosed && popClosed; } -size_t Connection::encode(const char* buffer, size_t size) { +size_t Connection::encode(char* buffer, size_t size) { { // Swap frameQueue data into workQueue to avoid holding lock while we encode. Mutex::ScopedLock l(frameQueueLock); if (popClosed) return 0; // Can't pop any more frames. assert(workQueue.empty()); workQueue.swap(frameQueue); } - framing::Buffer out(const_cast<char*>(buffer), size); + framing::Buffer out(buffer, size); if (!isClient && !initialized) { framing::ProtocolInitiation pi(getVersion()); pi.encode(out); diff --git a/qpid/cpp/src/qpid/amqp_0_10/Connection.h b/qpid/cpp/src/qpid/amqp_0_10/Connection.h index 995d824796..4a08ee51fd 100644 --- a/qpid/cpp/src/qpid/amqp_0_10/Connection.h +++ b/qpid/cpp/src/qpid/amqp_0_10/Connection.h @@ -61,7 +61,7 @@ class Connection : public sys::ConnectionCodec, QPID_BROKER_EXTERN Connection(sys::OutputControl&, const std::string& id, bool isClient); QPID_BROKER_EXTERN void setInputHandler(std::auto_ptr<sys::ConnectionInputHandler> c); size_t decode(const char* buffer, size_t size); - size_t encode(const char* buffer, size_t size); + size_t encode(char* buffer, size_t size); bool isClosed() const; bool canEncode(); void abort(); |