fixing GCC 6.3 issues
fixing GCC 6.3 issues

kopachev/swblocks-baselib,kopachev/swblocks-baselib,lazar-ivanov/swblocks-baselib,jpmorganchase/swblocks-baselib,kopachev/swblocks-baselib,kopachev/swblocks-baselib,lazar-ivanov/swblocks-baselib,lazar-ivanov/swblocks-baselib,jpmorganchase/swblocks-baselib,jpmorganchase/swblocks-baselib,jpmorganchase/swblocks-baselib,lazar-ivanov/swblocks-baselib