SPIN/master
stefan.schmidt/cpp_warnings
This fixes the two remaining warnings when compiling the C++ portion.
This fixes the two remaining warnings when compiling the C++ portion.