Support compiling with -std=c++* (and -std=gnu++*)

Support compiling with -std=c++* (and -std=gnu++*) #767