-/* Copyright (c) 2014. The SimGrid Team.
+/* Copyright (c) 2014-2015. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
#include <assert.h>
#include <stdlib.h>
-#include "../src/mc/mc_private.h"
-#include "../src/mc/mc_object_info.h"
+#include "mc/mc_process.h"
+#include "mc/mc_private.h"
+#include "mc/mc_object_info.h"
-static mc_process_t process;
+#include "mc/Type.hpp"
+#include "mc/ObjectInformation.hpp"
+#include "mc/Variable.hpp"
+
+static simgrid::mc::Process* process;
static
uintptr_t eval_binary_operation(mc_expression_state_t state, int op, uintptr_t a, uintptr_t b) {
s_mc_expression_state_t state;
memset(&state, 0, sizeof(s_mc_expression_state_t));
- state.address_space = (mc_address_space_t) process;
+ state.address_space = (simgrid::mc::AddressSpace*) process;
basic_test(&state);