v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2574 from gongminmin/RemoveStdIterator 

Remove the usage of std::iterator
pull/2590/head
Kim Kulling 2019-08-09 20:03:24 +02:00 committed by GitHub
parent 1097f47ff5 f1f409d538
commit 7d67eca52c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
code/X3D/X3DImporter.cpp
View File

@ -80,7 +80,13 @@ const aiImporterDesc X3DImporter::Description = {
//const std::regex X3DImporter::pattern_nws(R"([^, \t\r\n]+)"); //const std::regex X3DImporter::pattern_nws(R"([^, \t\r\n]+)");
//const std::regex X3DImporter::pattern_true(R"(^\s*(?:true|1)\s*$)", std::regex::icase); //const std::regex X3DImporter::pattern_true(R"(^\s*(?:true|1)\s*$)", std::regex::icase);
struct WordIterator: public std::iterator<std::input_iterator_tag, const char*> { struct WordIterator {
using iterator_category = std::input_iterator_tag;
using value_type = const char*;
using difference_type = ptrdiff_t;
using pointer = value_type*;
using reference = value_type&;
static const char *whitespace; static const char *whitespace;
const char *start_, *end_; const char *start_, *end_;
WordIterator(const char *start, const char *end): start_(start), end_(end) { WordIterator(const char *start, const char *end): start_(start), end_(end) {