Merge pull request #12 from realm/tg-core-0.94.4

Update for core 0.94.4
realm · Nov 5, 2015 · e9ca54e · e9ca54e
2 parents 0823a62 + 52e7e61
commit e9ca54e
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 13 deletions.
diff --git a/impl/transact_log_handler.cpp b/impl/transact_log_handler.cpp
@@ -175,7 +175,7 @@ class TransactLogHandler {
         return true;
     }
 
-    bool select_link_list(size_t col, size_t row)
+    bool select_link_list(size_t col, size_t row, size_t)
     {
         m_active_linklist = nullptr;
         for (auto& o : m_observers) {
@@ -303,15 +303,22 @@ class TransactLogHandler {
     bool set_date_time(size_t col, size_t row, DateTime) { return mark_dirty(row, col); }
     bool set_table(size_t col, size_t row) { return mark_dirty(row, col); }
     bool set_mixed(size_t col, size_t row, const Mixed&) { return mark_dirty(row, col); }
-    bool set_link(size_t col, size_t row, size_t) { return mark_dirty(row, col); }
+    bool set_link(size_t col, size_t row, size_t, size_t) { return mark_dirty(row, col); }
     bool set_null(size_t col, size_t row) { return mark_dirty(row, col); }
-    bool nullify_link(size_t col, size_t row) { return mark_dirty(row, col); }
+    bool nullify_link(size_t col, size_t row, size_t) { return mark_dirty(row, col); }
 
     // Doesn't change any data
     bool optimize_table() { return true; }
 
     // Used for subtables, which we currently don't support
     bool select_descriptor(int, const size_t*) { return false; }
+
+    // Not implemented
+    bool insert_substring(size_t, size_t, size_t, StringData) { return false; }
+    bool erase_substring(size_t, size_t, size_t, size_t) { return false; }
+    bool swap_rows(size_t, size_t) { return false; }
+    bool move_column(size_t, size_t) { return false; }
+    bool move_group_level_table(size_t, size_t) { return false; }
 };
 } // anonymous namespace
 

diff --git a/object_schema.hpp b/object_schema.hpp
@@ -25,8 +25,8 @@
 #include <vector>
 
 namespace realm {
-    class Property;
     class Group;
+    struct Property;
 
     class ObjectSchema {
     public:

diff --git a/object_store.cpp b/object_store.cpp
@@ -562,11 +562,7 @@ InvalidNullabilityException::InvalidNullabilityException(std::string const& obje
         m_what = "'Object' property '" + property.name + "' must be nullable.";
     }
     else {
-#if REALM_NULL_STRINGS == 1
         m_what = "Array or Mixed property '" + property.name + "' cannot be nullable";
-#else
-        m_what = "Only 'Object' property types are nullable";
-#endif
     }
 }
 

diff --git a/schema.cpp b/schema.cpp
@@ -71,11 +71,7 @@ void Schema::validate() const
 
             // check nullablity
             if (prop.is_nullable) {
-#if REALM_NULL_STRINGS == 1
                 if (prop.type == PropertyTypeArray || prop.type == PropertyTypeAny) {
-#else
-                if (prop.type != PropertyTypeObject) {
-#endif
                     exceptions.emplace_back(InvalidNullabilityException(object.name, prop));
                 }
             }

diff --git a/schema.hpp b/schema.hpp
@@ -52,4 +52,4 @@ class Schema : private std::vector<ObjectSchema> {
 };
 }
 
-#endif /* defined(REALM_SCHEMA_HPP) */
+#endif /* defined(REALM_SCHEMA_HPP) */