Build fixes for clang
Merge branch 'master' of https://github.com/openscenegraph/osg into Dev