more pr feedback

This commit is contained in:
Ari Lazier 2016-05-27 16:03:03 -07:00
parent e316b54eff
commit 3e74cd98d5
4 changed files with 5 additions and 5 deletions

View File

@ -102,7 +102,7 @@ std::shared_ptr<Realm> RealmCoordinator::get_realm(Realm::Config config)
} }
} }
} }
auto realm = std::make_shared<Realm>(std::move(config)); auto realm = std::make_shared<Realm>(std::move(config));
realm->init(shared_from_this()); realm->init(shared_from_this());

View File

@ -157,7 +157,7 @@ namespace realm {
private: private:
std::vector<ObjectSchemaValidationException> m_validation_errors; std::vector<ObjectSchemaValidationException> m_validation_errors;
}; };
class SchemaMismatchException : public ObjectStoreException { class SchemaMismatchException : public ObjectStoreException {
public: public:
SchemaMismatchException(std::vector<ObjectSchemaValidationException> const& errors); SchemaMismatchException(std::vector<ObjectSchemaValidationException> const& errors);

View File

@ -463,10 +463,10 @@ void Realm::close()
m_coordinator = nullptr; m_coordinator = nullptr;
} }
int Realm::file_format_upgraded_from_version() const util::Optional<int> Realm::file_format_upgraded_from_version() const
{ {
if (upgrade_initial_version != upgrade_final_version) { if (upgrade_initial_version != upgrade_final_version) {
return upgrade_initial_version; return upgrade_initial_version;
} }
return 0; return util::Optional<int>();
} }

View File

@ -133,7 +133,7 @@ namespace realm {
void close(); void close();
// returns the file format version upgraded from, or 0 if not upgraded // returns the file format version upgraded from, or 0 if not upgraded
int file_format_upgraded_from_version() const; util::Optional<int> file_format_upgraded_from_version() const;
~Realm(); ~Realm();