fix for make_pair() on C++11

Seems to work on earlier versions of C++ as well. Also I think that this is going to be #1000!