Merge pull request #1505 from iovisor/yhs_dev

fix a compilation error with latest llvm/clang trunk