From 0319431d6c2e70971f907c27e584d194104c7bb3 Mon Sep 17 00:00:00 2001 From: Gabriel Corona Date: Wed, 22 Jun 2016 16:34:23 +0200 Subject: [PATCH 1/1] [simix] Fix extern 'C' error from clang --- src/mc/mc_smx.cpp | 2 +- src/simix/smx_private.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mc/mc_smx.cpp b/src/mc/mc_smx.cpp index b7135d6a59..09571a13cd 100644 --- a/src/mc/mc_smx.cpp +++ b/src/mc/mc_smx.cpp @@ -84,7 +84,7 @@ void Process::refresh_simix() this->read_variable("simix_global", &simix_global_p, sizeof(simix_global_p)); // simix_global = REMOTE(*simix_global) - simgrid::simix::Global simix_global; + union { simgrid::simix::Global simix_global }; this->read_bytes(&simix_global, sizeof(simix_global), remote(simix_global_p)); diff --git a/src/simix/smx_private.h b/src/simix/smx_private.h index bb735b8e84..1808c16991 100644 --- a/src/simix/smx_private.h +++ b/src/simix/smx_private.h @@ -172,8 +172,8 @@ XBT_PRIVATE void SIMIX_post_create_environment(void); // FIXME, Dirty hack for SMPI+MSG XBT_PRIVATE void SIMIX_process_set_cleanup_function(smx_process_t process, void_pfn_smxprocess_t cleanup); -XBT_PRIVATE simgrid::simix::ActorCodeFactory& SIMIX_get_actor_code_factory(const char *name); - SG_END_DECL() +XBT_PRIVATE simgrid::simix::ActorCodeFactory& SIMIX_get_actor_code_factory(const char *name); + #endif -- 2.20.1