Repository: trafficserver Updated Branches: refs/heads/master 665147595 -> d10472eb6
TS-3935: Fix clang errors with for_Vec Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/d10472eb Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/d10472eb Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/d10472eb Branch: refs/heads/master Commit: d10472eb6bc4ad6922abf29d339a91b5b37d3260 Parents: 6651475 Author: Alan M. Carroll <[email protected]> Authored: Wed Dec 16 20:21:46 2015 -0600 Committer: Alan M. Carroll <[email protected]> Committed: Wed Dec 16 20:21:46 2015 -0600 ---------------------------------------------------------------------- lib/ts/Vec.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d10472eb/lib/ts/Vec.h ---------------------------------------------------------------------- diff --git a/lib/ts/Vec.h b/lib/ts/Vec.h index 1ee35ec..f8faecc 100644 --- a/lib/ts/Vec.h +++ b/lib/ts/Vec.h @@ -163,17 +163,17 @@ private: #define forv_Vec(_c, _p, _v) \ if ((_v).n) \ for (_c *qq__##_p = (_c *)0, *_p = (_v).v[0]; \ - ((uintptr_t)(qq__##_p) < (_v).length()) && ((_p = (_v).v[(intptr_t)qq__##_p]) || 1); \ + ((uintptr_t)(qq__##_p) < (_v).length()) && ((_p = (_v).v[(intptr_t)qq__##_p]) , 1); \ qq__##_p = (_c *)(((intptr_t)qq__##_p) + 1)) #define for_Vec(_c, _p, _v) \ if ((_v).n) \ for (_c *qq__##_p = (_c *)0, _p = (_v).v[0]; \ - ((uintptr_t)(qq__##_p) < (_v).length()) && ((_p = (_v).v[(intptr_t)qq__##_p]) || 1); \ + ((uintptr_t)(qq__##_p) < (_v).length()) && ((_p = (_v).v[(intptr_t)qq__##_p]) , 1); \ qq__##_p = (_c *)(((intptr_t)qq__##_p) + 1)) #define forvp_Vec(_c, _p, _v) \ if ((_v).n) \ for (_c *qq__##_p = (_c *)0, *_p = &(_v).v[0]; \ - ((uintptr_t)(qq__##_p) < (_v).length()) && ((_p = &(_v).v[(intptr_t)qq__##_p]) || 1); \ + ((uintptr_t)(qq__##_p) < (_v).length()) && ((_p = &(_v).v[(intptr_t)qq__##_p]) , 1); \ qq__##_p = (_c *)(((intptr_t)qq__##_p) + 1)) template <class C, class A = DefaultAlloc, int S = VEC_INTEGRAL_SHIFT_DEFAULT> class Accum
