fixed issue with multiple defenitions in cpp interface

Merged Petr Karpov requested to merge peter_fixes_cpp_multiple_defenitions into master_pre_stage

Merge request reports