Fix for trunk 212388+
Merge pull request #817 from Vsevolod-Livinskij/hotfix

Fix for trunk 212388
Add proper cast to eliminate size mismatch warning
Merge pull request #818 from jbrodman/master

Add proper cast to eliminate size mismatch warning
Fixed Makefile target gcc to use g++ instead of clang
Merge pull request #819 from ncos/Makefile-issue

Fixed Makefile target gcc to use g++ instead of clang