* There is still work to reconcile C++ header changes with the interface
  generators.

merged trunk into cdi_conversion_c++ and changed type of len in function serializeStrTabGetSize() to int, removed anonymous function in serializeStrTabGetSize() and replaced it with &len

replaced designated initializer with manual initialization for struct varDefZAxisSearchState since c++ does not support this feature, added explicit casts in various files

removed const since c++ does not allow to use memcpy with a const lvalue destination, removed array length in array parameters brackets, changed type of len from size_t to int since it is only used as int and replaced anonym funtion that cast len to int by &len

added explicit cast in line 267, changed parameter uuid[CDI_UUID_SIZE] to *uuid in function cdiUUIDIsNull