diff options
Diffstat (limited to 'cpp/src/qpid')
| -rw-r--r-- | cpp/src/qpid/broker/SaslAuthenticator.cpp | 5 | ||||
| -rw-r--r-- | cpp/src/qpid/framing/Blob.h | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/cpp/src/qpid/broker/SaslAuthenticator.cpp b/cpp/src/qpid/broker/SaslAuthenticator.cpp index a542211147..136cf6f785 100644 --- a/cpp/src/qpid/broker/SaslAuthenticator.cpp +++ b/cpp/src/qpid/broker/SaslAuthenticator.cpp @@ -234,9 +234,10 @@ void CyrusAuthenticator::processAuthenticationStep(int code, const char *challen throw ConnectionForcedException("Authenticated username unavailable"); } - QPID_LOG(info, "SASL: Authentication succeeded for: " << (char *)uid); + QPID_LOG(info, "SASL: Authentication succeeded for: " + << const_cast<char*>(static_cast<const char*>(uid))); - connection.setUserId((char *)uid); + connection.setUserId(const_cast<char*>(static_cast<const char*>(uid))); client.tune(framing::CHANNEL_MAX, connection.getFrameMax(), 0, 0); } else if (SASL_CONTINUE == code) { diff --git a/cpp/src/qpid/framing/Blob.h b/cpp/src/qpid/framing/Blob.h index 7cf4cefc3b..5c84384ad7 100644 --- a/cpp/src/qpid/framing/Blob.h +++ b/cpp/src/qpid/framing/Blob.h @@ -130,7 +130,7 @@ class Blob copy = b.copy; destroy = b.destroy; basePtr = reinterpret_cast<BaseType*>( - ((char*)this)+ ((char*)(b.basePtr) - (char*)(&b))); + ((char*)this)+ ((const char*)(b.basePtr) - (const char*)(&b))); } public: |