Removed several compile warnings from CTHAdaptor

Change-Id: Idd3ca4a22184048392eee23d60de01be5e5e6f6f
Merge topic 'fix_cthadaptor_compile_warnings' into next

e0231e6 Removed several compile warnings from CTHAdaptor