diff options
author | Gil <mcg@google.com> | 2018-07-11 15:27:50 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-11 15:27:50 -0700 |
commit | e1ace703fbf4458d9e887ebf30050b1a0482a2d2 (patch) | |
tree | 63537e388b8d16a5625eedce0937cb50bf69d4c7 /Firestore/core/src/firebase/firestore/immutable | |
parent | 79f663d5eaaa4b7f9fe46d176c82660d38e4be8a (diff) |
Fix Firestore source errors under VS2017 (#1515)
* Project file updates from sync_project.rb
* Fix misc compile errors under VS2017
* Fix util/hashing under VS2017
std::hash<int> is not just a pass through in Microsoft's STL.
* Disable unsafe code warnings in VS2017
... where comparing against a reference implementation that has no easy
safe equivalent.
* Handle drive letters in paths on Windows
Diffstat (limited to 'Firestore/core/src/firebase/firestore/immutable')
-rw-r--r-- | Firestore/core/src/firebase/firestore/immutable/sorted_map_iterator.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Firestore/core/src/firebase/firestore/immutable/sorted_map_iterator.h b/Firestore/core/src/firebase/firestore/immutable/sorted_map_iterator.h index 960e3f6..20c11a7 100644 --- a/Firestore/core/src/firebase/firestore/immutable/sorted_map_iterator.h +++ b/Firestore/core/src/firebase/firestore/immutable/sorted_map_iterator.h @@ -119,7 +119,9 @@ class SortedMapIterator { pointer get() const { switch (tag_) { case Tag::Array: - return array_iter_; + // std::array::iterator is not guaranteed to be a bare pointer but will + // be a RandomAccessIterator which does have operator*(). + return &*array_iter_; case Tag::Tree: return tree_iter_.get(); } |