Repository: trafficserver Updated Branches: refs/heads/master d10472eb6 -> 9fe75036e
TS-3908: Fix clang errors in WCCP. Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/9fe75036 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/9fe75036 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/9fe75036 Branch: refs/heads/master Commit: 9fe75036e069f191ed18fb8ac4fd749a49635d87 Parents: d10472e Author: Alan M. Carroll <[email protected]> Authored: Wed Dec 16 20:39:24 2015 -0600 Committer: Alan M. Carroll <[email protected]> Committed: Wed Dec 16 20:39:24 2015 -0600 ---------------------------------------------------------------------- lib/wccp/WccpConfig.cc | 1 - lib/wccp/WccpEndPoint.cc | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9fe75036/lib/wccp/WccpConfig.cc ---------------------------------------------------------------------- diff --git a/lib/wccp/WccpConfig.cc b/lib/wccp/WccpConfig.cc index b2a5327..60bf842 100644 --- a/lib/wccp/WccpConfig.cc +++ b/lib/wccp/WccpConfig.cc @@ -61,7 +61,6 @@ static char const *const SVC_PROP_ID = "id"; static char const *const SVC_PROP_TYPE = "type"; static char const *const SVC_PROP_PRIORITY = "priority"; static char const *const SVC_PROP_PROTOCOL = "protocol"; -static char const *const SVC_PROP_FLAGS = "flags"; static char const *const SVC_PROP_PRIMARY_HASH = "primary-hash"; static char const *const SVC_PROP_ALT_HASH = "alt-hash"; static char const *const SVC_PROP_PORTS = "ports"; http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9fe75036/lib/wccp/WccpEndPoint.cc ---------------------------------------------------------------------- diff --git a/lib/wccp/WccpEndPoint.cc b/lib/wccp/WccpEndPoint.cc index 2157413..b254156 100644 --- a/lib/wccp/WccpEndPoint.cc +++ b/lib/wccp/WccpEndPoint.cc @@ -367,7 +367,7 @@ CacheImpl::RouterData::waitTime(time_t now) const } inline uint32_t -CacheImpl::CacheData::idAddr() const +detail::cache::CacheData::idAddr() const { return m_id.getAddr(); } @@ -909,7 +909,7 @@ CacheImpl::handleRemovalQuery(IpHeader const & /* ip_hdr ATS_UNUSED */, ts::Buff } // ------------------------------------------------------ inline uint32_t -RouterImpl::CacheData::idAddr() const +detail::router::CacheData::idAddr() const { return m_id.getAddr(); }
