Fixes for new compilers
Merging upstream
Merge branch 'master' of github.com:diegocaro/libcds