Fix warning about unused local typedef
Fix tpie/CMakeLists.txt not including merge_sorter.cpp.