adjust stuff for recent clang
Merge pull request #138 from basho/1.4.9

adjust stuff for recent clang