From 3d0af084bbb0cc7ffce1fb741f4e5fae20f5d4bc Mon Sep 17 00:00:00 2001
From: Ari Lazier <alazier@gmail.com>
Date: Fri, 13 May 2016 18:45:42 -0700
Subject: [PATCH] fix for android compilation

---
 react-native/android/src/main/jni/Android.mk           | 10 +++++-----
 .../src/impl/collection_change_builder.cpp             |  1 +
 src/object-store/src/impl/realm_coordinator.cpp        |  1 +
 src/object-store/src/impl/transact_log_handler.cpp     |  1 +
 src/object-store/src/results.cpp                       |  2 +-
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/react-native/android/src/main/jni/Android.mk b/react-native/android/src/main/jni/Android.mk
index 8dbc87fa..ebc54405 100644
--- a/react-native/android/src/main/jni/Android.mk
+++ b/react-native/android/src/main/jni/Android.mk
@@ -22,21 +22,21 @@ LOCAL_SRC_FILES := \
   src/android/io_realm_react_RealmReactModule.cpp \
   src/android/jsc_override.cpp \
   src/object-store/src/collection_notifications.cpp \
-  src/object-store/src/collection_change_builder.cpp \
-  src/object-store/src/collection_notifier.cpp \
   src/object-store/src/index_set.cpp \
   src/object-store/src/list.cpp \
-  src/object-store/src/list_notifier.cpp \
   src/object-store/src/object_schema.cpp \
   src/object-store/src/object_store.cpp \
   src/object-store/src/results.cpp \
-  src/object-store/src/results_notifier.cpp \
   src/object-store/src/schema.cpp \
   src/object-store/src/shared_realm.cpp \
   src/object-store/src/parser/parser.cpp \
   src/object-store/src/parser/query_builder.cpp \
-  src/object-store/src/impl/transact_log_handler.cpp \
+  src/object-store/src/impl/collection_change_builder.cpp \
+  src/object-store/src/impl/collection_notifier.cpp \
+  src/object-store/src/impl/list_notifier.cpp \
   src/object-store/src/impl/realm_coordinator.cpp \
+  src/object-store/src/impl/results_notifier.cpp \
+  src/object-store/src/impl/transact_log_handler.cpp \
   src/object-store/src/impl/generic/external_commit_helper.cpp \
   vendor/base64.cpp
 
diff --git a/src/object-store/src/impl/collection_change_builder.cpp b/src/object-store/src/impl/collection_change_builder.cpp
index da0ff5ab..731e07ad 100644
--- a/src/object-store/src/impl/collection_change_builder.cpp
+++ b/src/object-store/src/impl/collection_change_builder.cpp
@@ -19,6 +19,7 @@
 #include "impl/collection_change_builder.hpp"
 
 #include <realm/util/assert.hpp>
+#include <algorithm>
 
 using namespace realm;
 using namespace realm::_impl;
diff --git a/src/object-store/src/impl/realm_coordinator.cpp b/src/object-store/src/impl/realm_coordinator.cpp
index 86b118a8..df53a2ce 100644
--- a/src/object-store/src/impl/realm_coordinator.cpp
+++ b/src/object-store/src/impl/realm_coordinator.cpp
@@ -31,6 +31,7 @@
 #include <realm/string_data.hpp>
 
 #include <unordered_map>
+#include <algorithm>
 
 using namespace realm;
 using namespace realm::_impl;
diff --git a/src/object-store/src/impl/transact_log_handler.cpp b/src/object-store/src/impl/transact_log_handler.cpp
index e0880bee..85d44bd6 100644
--- a/src/object-store/src/impl/transact_log_handler.cpp
+++ b/src/object-store/src/impl/transact_log_handler.cpp
@@ -24,6 +24,7 @@
 
 #include <realm/group_shared.hpp>
 #include <realm/lang_bind_helper.hpp>
+#include <algorithm>
 
 using namespace realm;
 
diff --git a/src/object-store/src/results.cpp b/src/object-store/src/results.cpp
index 39621e8d..f2961337 100644
--- a/src/object-store/src/results.cpp
+++ b/src/object-store/src/results.cpp
@@ -411,7 +411,7 @@ Query Results::get_query() const
             // The TableView has no associated query so create one with no conditions that is restricted
             // to the rows in the TableView.
             m_table_view.sync_if_needed();
-            return Query(*m_table, std::make_unique<TableView>(m_table_view));
+            return Query(*m_table, (std::unique_ptr<TableViewBase>)std::make_unique<TableView>(m_table_view));
         }
         case Mode::LinkView:
             return m_table->where(m_link_view);