Fix clang errors / warnings.

- These have been introduced recently. C++14 cannot come early enough.
Merge pull request #4267 from ktf/fix-csc-clang

Fix csc clang