* fixed warning
* fixed c++11 warnings