From 987978fd4e447f39d732f86dc5345b00656a4875 Mon Sep 17 00:00:00 2001
From: Ari Lazier <alazier@gmail.com>
Date: Thu, 3 Mar 2016 16:49:06 -0800
Subject: [PATCH] pr fixes

---
 src/object-store/src/parser/query_builder.cpp | 5 ++---
 src/object-store/src/results.hpp              | 1 +
 src/object-store/src/schema.hpp               | 1 -
 src/object-store/src/shared_realm.hpp         | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/object-store/src/parser/query_builder.cpp b/src/object-store/src/parser/query_builder.cpp
index 98e6b4c7..478bd52e 100644
--- a/src/object-store/src/parser/query_builder.cpp
+++ b/src/object-store/src/parser/query_builder.cpp
@@ -46,9 +46,8 @@ T stot(const std::string s) {
 #define precondition(condition, message) if (!__builtin_expect(condition, 1)) {  throw std::runtime_error(message); }
 
 // FIXME: TrueExpression and FalseExpression should be supported by core in some way
-class TrueExpression : public realm::Expression {
-  public:
-    virtual size_t find_first(size_t start, size_t end) const
+struct TrueExpression : realm::Expression {
+    size_t find_first(size_t start, size_t end) const override
     {
         if (start != end)
             return start;
diff --git a/src/object-store/src/results.hpp b/src/object-store/src/results.hpp
index 8a5e1213..91784cde 100644
--- a/src/object-store/src/results.hpp
+++ b/src/object-store/src/results.hpp
@@ -20,6 +20,7 @@
 #define REALM_RESULTS_HPP
 
 #include "shared_realm.hpp"
+#include "object_store.hpp"
 #include "util/atomic_shared_ptr.hpp"
 
 #include <realm/table_view.hpp>
diff --git a/src/object-store/src/schema.hpp b/src/object-store/src/schema.hpp
index 9e86efa2..65a806ec 100644
--- a/src/object-store/src/schema.hpp
+++ b/src/object-store/src/schema.hpp
@@ -23,7 +23,6 @@
 
 #include <string>
 #include <vector>
-#include <string>
 
 namespace realm {
 class ObjectSchema;
diff --git a/src/object-store/src/shared_realm.hpp b/src/object-store/src/shared_realm.hpp
index 32fbad98..128bd004 100644
--- a/src/object-store/src/shared_realm.hpp
+++ b/src/object-store/src/shared_realm.hpp
@@ -19,7 +19,7 @@
 #ifndef REALM_REALM_HPP
 #define REALM_REALM_HPP
 
-#include "object_store.hpp"
+#include "schema.hpp"
 
 #include <realm/handover_defs.hpp>