Use make_pair() C++ API

Signed-off-by: Pekka Enberg <penberg@kernel.org>