Merge changes I3ba75c45,I97d26285
authorJames Zern <jzern@google.com>
Wed, 6 Jun 2018 04:54:41 +0000 (04:54 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 6 Jun 2018 04:54:41 +0000 (04:54 +0000)
commitd5bd2809f1eaf93203f8bad385f2b02fd03b01e7
treecde3650641507339cc507c9520ff2d2eff209803
parent0826a475b0ecc1009bf08d8ae25ef62f6c519569
parenta405bc2ec975400db5f5d856d1e87a0c363a4913
Merge changes I3ba75c45,I97d26285

* changes:
  force-inline the convolve functions
  Unbreak the force inline directive for gcc