diff options
author | Gil <mcg@google.com> | 2018-05-30 10:24:40 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-30 10:24:40 -0700 |
commit | 03d26a76a0f7efb7ed3bb142a8e558fb68e4cccf (patch) | |
tree | ca28b589d32befd6bb338db819d53afe5c37979b /Firestore/core/src/firebase | |
parent | 72d8be3dfac415e0843417b1ae9e5b8f98e22b88 (diff) |
Remove nearly all usages of WrapNSStringNoCopy (#1351)
Diffstat (limited to 'Firestore/core/src/firebase')
3 files changed, 13 insertions, 2 deletions
diff --git a/Firestore/core/src/firebase/firestore/util/comparison.cc b/Firestore/core/src/firebase/firestore/util/comparison.cc index 5ac4c27..d1cdbfa 100644 --- a/Firestore/core/src/firebase/firestore/util/comparison.cc +++ b/Firestore/core/src/firebase/firestore/util/comparison.cc @@ -31,6 +31,12 @@ bool Comparator<absl::string_view>::operator()( return left < right; } +bool Comparator<std::string>::operator()(const std::string& left, + const std::string& right) const { + // TODO(wilhuff): truncation aware comparison + return left < right; +} + bool Comparator<double>::operator()(double left, double right) const { // NaN sorts equal to itself and before any other number. if (left < right) { diff --git a/Firestore/core/src/firebase/firestore/util/comparison.h b/Firestore/core/src/firebase/firestore/util/comparison.h index d7f4dfd..a7d7944 100644 --- a/Firestore/core/src/firebase/firestore/util/comparison.h +++ b/Firestore/core/src/firebase/firestore/util/comparison.h @@ -86,6 +86,11 @@ struct Comparator<absl::string_view> { const absl::string_view& right) const; }; +template <> +struct Comparator<std::string> { + bool operator()(const std::string& left, const std::string& right) const; +}; + /** Compares two bools: false < true. */ template <> struct Comparator<bool> : public std::less<bool> {}; diff --git a/Firestore/core/src/firebase/firestore/util/hard_assert_apple.mm b/Firestore/core/src/firebase/firestore/util/hard_assert_apple.mm index 3324fe8..6abd324 100644 --- a/Firestore/core/src/firebase/firestore/util/hard_assert_apple.mm +++ b/Firestore/core/src/firebase/firestore/util/hard_assert_apple.mm @@ -32,8 +32,8 @@ void Fail(const char* file, const int line, const std::string& message) { [[NSAssertionHandler currentHandler] - handleFailureInFunction:WrapNSStringNoCopy(func) - file:WrapNSStringNoCopy(file) + handleFailureInFunction:WrapNSString(func) + file:WrapNSString(file) lineNumber:line description:@"FIRESTORE INTERNAL ASSERTION FAILED: %s", message.c_str()]; |