partial fix for build with llvm 5.0 for apple-darwin13.0.0
Merge branch 'fix-paircompare' into Accumulator