Type disambiguation for C++11
fix: resolve ambiguity std::pair vs. std::tuple. Fixes ticket #9540

Seen with multiple compilers which support C++11's newly introduced std::tuple. Rather than pulling just the required entities from namespace 'std', the full namespace was pulled in instead.

Signed-off-by: Daniela Engert <dani@ngrt.de>