[#1732] Removed __cplusplus ifdefs, as we always compile with c++