
Diagnostics can be required on both instance and session level, so both cases need to be handled explicitly. In addition, some reinterpret_casts were changed into static_casts. Reinterpret_cast needs to be used with the instance, which is a void** but static_cast is sufficient for the session, which is void*.