From 9fe636b614ee93ae730881cc2a066684c980c219 Mon Sep 17 00:00:00 2001 From: Ari Lazier Date: Fri, 27 May 2016 15:50:33 -0700 Subject: [PATCH] pr feedback --- src/object-store/src/impl/realm_coordinator.cpp | 2 +- src/object-store/src/object_accessor.hpp | 2 +- src/object-store/src/parser/query_builder.cpp | 5 ++--- src/object-store/src/shared_realm.cpp | 2 +- src/object-store/src/shared_realm.hpp | 2 +- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/object-store/src/impl/realm_coordinator.cpp b/src/object-store/src/impl/realm_coordinator.cpp index 47033a67..931416b8 100644 --- a/src/object-store/src/impl/realm_coordinator.cpp +++ b/src/object-store/src/impl/realm_coordinator.cpp @@ -114,7 +114,7 @@ std::shared_ptr RealmCoordinator::get_realm(Realm::Config config) throw RealmFileException(RealmFileException::Kind::AccessError, config.path, ex.code().message()); } } - + m_weak_realm_notifiers.emplace_back(realm, m_config.cache); return realm; } diff --git a/src/object-store/src/object_accessor.hpp b/src/object-store/src/object_accessor.hpp index c20282b6..951fbb33 100644 --- a/src/object-store/src/object_accessor.hpp +++ b/src/object-store/src/object_accessor.hpp @@ -207,7 +207,7 @@ namespace realm { auto string_value = Accessor::to_string(ctx, value); m_row.set_string(column, string_value); break; - } + } case PropertyType::Data: m_row.set_binary(column, BinaryData(Accessor::to_binary(ctx, value))); break; diff --git a/src/object-store/src/parser/query_builder.cpp b/src/object-store/src/parser/query_builder.cpp index 26f195ee..43a1b00e 100644 --- a/src/object-store/src/parser/query_builder.cpp +++ b/src/object-store/src/parser/query_builder.cpp @@ -501,10 +501,9 @@ void do_add_null_comparison_to_query(Query &query, const Schema &schema, const O do_add_null_comparison_to_query(query, cmp.op, expr, args); break; case realm::PropertyType::Array: - throw std::runtime_error((std::string)"Comparing Lists to 'null' is not supported"); - break; + throw std::runtime_error("Comparing Lists to 'null' is not supported"); default: { - throw std::runtime_error((std::string)"Object type " + string_for_property_type(type) + " not supported"); + throw std::runtime_error(std::string("Object type ") + string_for_property_type(type) + " not supported"); } } } diff --git a/src/object-store/src/shared_realm.cpp b/src/object-store/src/shared_realm.cpp index b77ec99c..c5d50b8e 100644 --- a/src/object-store/src/shared_realm.cpp +++ b/src/object-store/src/shared_realm.cpp @@ -68,7 +68,7 @@ Realm::Realm(Config config) } } -void Realm::open_with_config(Config& config, +void Realm::open_with_config(const Config& config, std::unique_ptr& history, std::unique_ptr& shared_group, std::unique_ptr& read_only_group, diff --git a/src/object-store/src/shared_realm.hpp b/src/object-store/src/shared_realm.hpp index d22b2c2d..d01bfdb1 100644 --- a/src/object-store/src/shared_realm.hpp +++ b/src/object-store/src/shared_realm.hpp @@ -158,7 +158,7 @@ namespace realm { static _impl::RealmCoordinator& get_coordinator(Realm& realm) { return *realm.m_coordinator; } }; - static void open_with_config(Config& config, + static void open_with_config(const Config& config, std::unique_ptr& history, std::unique_ptr& shared_group, std::unique_ptr& read_only_group,