Updated Branches: refs/heads/master c1bc42a82 -> 3f351654d
WCCP tweaks for clang compilation. Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/3f351654 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/3f351654 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/3f351654 Branch: refs/heads/master Commit: 3f351654db7d6d45a457b5329f22550a9f0c5957 Parents: c1bc42a Author: Alan M. Carroll <[email protected]> Authored: Fri Jul 27 09:41:43 2012 -0700 Committer: Alan M. Carroll <[email protected]> Committed: Fri Jul 27 09:41:43 2012 -0700 ---------------------------------------------------------------------- lib/wccp/WccpLocal.h | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3f351654/lib/wccp/WccpLocal.h ---------------------------------------------------------------------- diff --git a/lib/wccp/WccpLocal.h b/lib/wccp/WccpLocal.h index b8a83ea..8d80553 100644 --- a/lib/wccp/WccpLocal.h +++ b/lib/wccp/WccpLocal.h @@ -109,8 +109,6 @@ public: void* ptr, ///< Pointer to buffer. size_t n ///< Size of buffer. ); - /// Extract memory chunk - operator super const& () const; /// Get the buffer size. size_t getSize() const; @@ -3261,10 +3259,6 @@ inline MsgBuffer& MsgBuffer::set(void *ptr, size_t n) { return *this; } -inline MsgBuffer::operator MsgBuffer::super const& () const { - return *this; -} - inline MsgBuffer& MsgBuffer::use(size_t n) { _count += std::min(n, this->getSpace()); @@ -3457,7 +3451,7 @@ CompWithHeader<T>::checkHeader(MsgBuffer const& buffer, CompType ect) { inline AssignInfoComp::Bucket& AssignInfoComp::bucket(int idx) { return m_buckets[idx]; } inline AssignInfoComp::Bucket const& AssignInfoComp::bucket(int idx) const{ return m_buckets[idx]; } inline bool AssignInfoComp::compare(Bucket const buckets[N_BUCKETS]) const { - return 0 == memcmp(buckets, m_buckets, sizeof(buckets)); + return 0 == memcmp(buckets, m_buckets, sizeof(m_buckets)); } inline RouterViewComp::RouterViewComp()
