aboutsummaryrefslogtreecommitdiff
path: root/ports/assimp/const-compare-worditerator.patch
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2017-08-24 02:55:25 -0700
committerRobert Schumacher <roschuma@microsoft.com>2017-08-24 02:55:25 -0700
commita3e607c8f1b759fee75ef5dd7b420ef7df48da1a (patch)
treefd5b9080c973896ddb7174aeebb666e1c09d0204 /ports/assimp/const-compare-worditerator.patch
parentbed70f54bc2dd7181a54bbbb94d2fe3a1a0b35cc (diff)
downloadvcpkg-a3e607c8f1b759fee75ef5dd7b420ef7df48da1a.tar.gz
vcpkg-a3e607c8f1b759fee75ef5dd7b420ef7df48da1a.zip
[assimp] Fix non-const-accepting WordIterator::operator!=
Diffstat (limited to 'ports/assimp/const-compare-worditerator.patch')
-rw-r--r--ports/assimp/const-compare-worditerator.patch15
1 files changed, 15 insertions, 0 deletions
diff --git a/ports/assimp/const-compare-worditerator.patch b/ports/assimp/const-compare-worditerator.patch
new file mode 100644
index 000000000..9b892ed82
--- /dev/null
+++ b/ports/assimp/const-compare-worditerator.patch
@@ -0,0 +1,15 @@
+diff --git a/code/X3DImporter.cpp b/code/X3DImporter.cpp
+index 1117735..669f46f 100644
+--- a/code/X3DImporter.cpp
++++ b/code/X3DImporter.cpp
+@@ -95,8 +95,8 @@ struct WordIterator: public std::iterator<std::input_iterator_tag, const char*>
+ end_ = other.end_;
+ return *this;
+ }
+- bool operator==(WordIterator &other) const { return start_ == other.start_; }
+- bool operator!=(WordIterator &other) const { return start_ != other.start_; }
++ bool operator==(const WordIterator &other) const { return start_ == other.start_; }
++ bool operator!=(const WordIterator &other) const { return start_ != other.start_; }
+ WordIterator &operator++() {
+ start_ += strcspn(start_, whitespace);
+ start_ += strspn(start_, whitespace);