adaptions for clang

svn path=/sandbox/; revision=83311