afc::Tokeniser::next(CharType *&, Char *&) is replaced with next(std::basic_string<CharType>::iterator &, std::basic_string<CharType>::iterator &) to have a valid value for the end of the string (i.e. std::basic_string<CharType>::end()).