Skip to content

Use Comparator in FieldValue. #686

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 19, 2018
Merged

Use Comparator in FieldValue. #686

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions Firestore/core/src/firebase/firestore/model/field_value.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,11 @@
#include <utility>
#include <vector>

#include "Firestore/core/src/firebase/firestore/util/comparison.h"
#include "Firestore/core/src/firebase/firestore/util/firebase_assert.h"

using firebase::firestore::util::Comparator;

namespace firebase {
namespace firestore {
namespace model {
Expand Down Expand Up @@ -137,8 +140,7 @@ bool operator<(const FieldValue& lhs, const FieldValue& rhs) {
case Type::Null:
return false;
case Type::Boolean:
// lhs < rhs iff lhs == false and rhs == true.
return !lhs.boolean_value_ && rhs.boolean_value_;
return Comparator<bool>()(lhs.boolean_value_, rhs.boolean_value_);
case Type::Array:
return lhs.array_value_ < rhs.array_value_;
default:
Expand Down