+minimal modifs for gcc/g++ 4.8.2