Mac C++11 Fix

Some code used was C++11 compatible only. Instead of masking the
warnings I took care of the issue due to the lack of C++11 support on
some machines.