Make sure types match exacty without conversion when making std::pairs.

Fixes the SunCC build, hopefully.
Merge topic 'LINK_LIBRARIES-property' into next

4cf80cc Make sure types match exacty without conversion when making std::pairs.