pr fixes

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;

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>

src/object-store/src/schema.hpp

@@ -23,7 +23,6 @@
 
 #include <string>
 #include <vector>
-#include <string>
 
 namespace realm {
 class ObjectSchema;

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>