Use nullptr instead of NULL for make_pair
musl libc defines NULL as nullptr, which is explicitly allowed by
C++11. nullptr_t cannot be cast to a pointer with reinterpret_cast,
static_cast must be used instead. Using nullptr directly without
any cast works better, as nullptr will only implicitly cast to a
pointer type, which avoids the method overload resolution problems
with NULL.
Bug: 190084016
Test: m USE_HOST_MUSL=true host-native
Change-Id: I11bfe2c2916a4d757d0cea76a45f37b4fde9ad25
3 files changed
