fix for make_pair() on C++11
Merge pull request #1000 from scopatz/mp

fix for make_pair() on C++11