diff options
| author | Gordon Sim <gsim@apache.org> | 2008-07-25 09:04:26 +0000 |
|---|---|---|
| committer | Gordon Sim <gsim@apache.org> | 2008-07-25 09:04:26 +0000 |
| commit | 335143afa82f5824b2bccf0e9efec36dceb3860d (patch) | |
| tree | 3419166e3599971b01deefcfe828271642cd6a3f | |
| parent | 0c68c0922a527e859e70339d8459b07cdfd75f45 (diff) | |
| download | qpid-python-335143afa82f5824b2bccf0e9efec36dceb3860d.tar.gz | |
QPID-1154, QPID-1155 & QPID-1156: Patches from Steve Huston to fix various minor compiler errors.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@679717 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | cpp/src/qpid/broker/SaslAuthenticator.cpp | 5 | ||||
| -rw-r--r-- | cpp/src/qpid/framing/Blob.h | 2 | ||||
| -rw-r--r-- | cpp/src/tests/InlineVector.cpp | 4 |
3 files changed, 6 insertions, 5 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: diff --git a/cpp/src/tests/InlineVector.cpp b/cpp/src/tests/InlineVector.cpp index 7add920cb2..bcd36e47b4 100644 --- a/cpp/src/tests/InlineVector.cpp +++ b/cpp/src/tests/InlineVector.cpp @@ -30,8 +30,8 @@ using namespace std; typedef InlineVector<int, 3> Vec; bool isInline(const Vec& v) { - return (char*)&v <= (char*)(&v[0]) && - (char*)(&v[0]) < (char*)&v+sizeof(v); + return (const char*)&v <= (const char*)(&v[0]) && + (const char*)(&v[0]) < (const char*)&v+sizeof(v); } QPID_AUTO_TEST_CASE(testCtor) { |