Merge pull request #21 from realm/tg-gcc49

Fix compilation with GCC 4.9
This commit is contained in:
Thomas Goyne 2015-12-04 14:30:55 -08:00
commit 7a0d96e1c7
5 changed files with 11 additions and 7 deletions

View File

@ -19,6 +19,7 @@
#ifndef REALM_INDEX_SET_HPP
#define REALM_INDEX_SET_HPP
#include <cstdlib>
#include <vector>
namespace realm {

View File

@ -17,7 +17,8 @@
////////////////////////////////////////////////////////////////////////////
#include "list.hpp"
#import <stdexcept>
#include <stdexcept>
using namespace realm;

View File

@ -19,13 +19,13 @@
#ifndef REALM_LIST_HPP
#define REALM_LIST_HPP
#import "shared_realm.hpp"
#import <realm/link_view.hpp>
#include "shared_realm.hpp"
#include <realm/link_view.hpp>
namespace realm {
class List {
public:
List(SharedRealm &r, const ObjectSchema &s, LinkViewRef l) : m_realm(r), object_schema(s), m_link_view(l) {}
List(SharedRealm &r, const ObjectSchema &s, LinkViewRef l) : object_schema(s), m_realm(r), m_link_view(l) {}
const ObjectSchema &object_schema;
SharedRealm realm() { return m_realm; }

View File

@ -19,6 +19,7 @@
#ifndef REALM_SCHEMA_HPP
#define REALM_SCHEMA_HPP
#include <string>
#include <vector>
namespace realm {

View File

@ -19,12 +19,13 @@
#ifndef REALM_REALM_HPP
#define REALM_REALM_HPP
#include "object_store.hpp"
#include <memory>
#include <mutex>
#include <thread>
#include <vector>
#include "object_store.hpp"
namespace realm {
class ClientHistory;
class Realm;
@ -166,7 +167,7 @@ namespace realm {
std::runtime_error(std::move(message)), m_kind(kind), m_path(std::move(path)) {}
Kind kind() const { return m_kind; }
const std::string& path() const { return m_path; }
private:
Kind m_kind;
std::string m_path;