----- Original Message ----- > Updated Branches: > refs/heads/master c88d6153e -> 270edbe70 > > > TS-1586: Fix the SPDY plugin build under clang on Linux. [snip] > Commit: 270edbe704bc3d69b56026d8d54e0f16891cb649 > Parents: c88d615 > Author: James Peach <jpe...@apache.org> > Authored: Fri Apr 19 20:43:25 2013 -0700 > Committer: James Peach <jpe...@apache.org> > Committed: Fri Apr 19 20:43:25 2013 -0700 > > ---------------------------------------------------------------------- > CHANGES | 1 + > plugins/experimental/spdy/lib/spdy/message.cc | 32 > ++++++++++---------- > plugins/experimental/spdy/spdy.cc | 8 ++-- > 3 files changed, 21 insertions(+), 20 deletions(-) > ---------------------------------------------------------------------- > > > http://git-wip-us.apache.org/repos/asf/trafficserver/blob/270edbe7/CHANGES > ---------------------------------------------------------------------- > diff --git a/CHANGES b/CHANGES > index 3351e2b..374f71c 100644 > --- a/CHANGES > +++ b/CHANGES > @@ -1,6 +1,7 @@ > -*- coding: > utf-8 -*- > Changes with Apache Traffic Server 3.3.3 > > + *) [TS-1586] Fix the SPDY plugin build under clang on Linux. > > *) [TS-1053] Make combo_handler compiler. Author: Conan Wang. > > > http://git-wip-us.apache.org/repos/asf/trafficserver/blob/270edbe7/plugins/experimental/spdy/lib/spdy/message.cc > ---------------------------------------------------------------------- > diff --git a/plugins/experimental/spdy/lib/spdy/message.cc > b/plugins/experimental/spdy/lib/spdy/message.cc > index 4521443..96de42d 100644 > --- a/plugins/experimental/spdy/lib/spdy/message.cc > +++ b/plugins/experimental/spdy/lib/spdy/message.cc > @@ -69,7 +69,7 @@ stringof<spdy::error>(const spdy::error& e) > // assembler. > > template <typename T> T > -extract(const uint8_t __restrict * &ptr) { > +extract(const uint8_t * &ptr) { > T val; > memcpy(&val, ptr, sizeof(val)); > std::advance(ptr, sizeof(val)); > @@ -77,31 +77,31 @@ extract(const uint8_t __restrict * &ptr) { > } > > template <> uint8_t > -extract<uint8_t>(const uint8_t __restrict * &ptr) { > +extract<uint8_t>(const uint8_t * &ptr) { > return *ptr++; > }
ugh.. I should've updated my patch which moves the "*" before "__restrict", in accordance to http://gcc.gnu.org/onlinedocs/gcc/Restricted-Pointers.html But perhaps this is all good, since it makes us more portable. -- i Igor Galić Tel: +43 (0) 664 886 22 883 Mail: i.ga...@brainsware.org URL: http://brainsware.org/ GPG: 6880 4155 74BD FD7C B515 2EA5 4B1D 9E08 A097 C9AE
