Merge pull request #12832 from kmansoo:fix-compile-errors-on-nvcc10
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 18 Oct 2018 07:51:47 +0000 (07:51 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 18 Oct 2018 07:51:47 +0000 (07:51 +0000)

Trivial merge