Merge pull request #7382 from alalek:ocl_build_fix_warnings
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 4 Oct 2016 12:08:22 +0000 (12:08 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 4 Oct 2016 12:08:22 +0000 (12:08 +0000)

Trivial merge