am 2ba70fd4: Merge "Use reinterpret_cast when an integer is cast to a pointer"

* commit '2ba70fd49bfcbb516e75c198c106764609335feb':
  Use reinterpret_cast when an integer is cast to a pointer