Removed several compile warnings from CTHAdaptor

Change-Id: Idd3ca4a22184048392eee23d60de01be5e5e6f6f
Fixed a typo creating a compile issue.

Change-Id: I1890a09e0ab3eab7d2d8d1e39a581c99fd31db06
Remove some compile warnings.

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

67a305c Remove some compile warnings.
935d6e7 Fixed a typo creating a compile issue.
e0231e6 Removed several compile warnings from CTHAdaptor