X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1bfdc9a38c22af6a9becf133be154a2fa2bc6589..7ce752524bd815bb66b262e4288903c6a9ebfc93:/examples/smpi/smpi_msg_masterslave/masterslave_mailbox_smpi.c diff --git a/examples/smpi/smpi_msg_masterslave/masterslave_mailbox_smpi.c b/examples/smpi/smpi_msg_masterslave/masterslave_mailbox_smpi.c index f36ee995a1..f0b2daa156 100644 --- a/examples/smpi/smpi_msg_masterslave/masterslave_mailbox_smpi.c +++ b/examples/smpi/smpi_msg_masterslave/masterslave_mailbox_smpi.c @@ -1,17 +1,16 @@ -/* Copyright (c) 2010-2014. The SimGrid Team. +/* Copyright (c) 2010-2015. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ #include -#include "msg/msg.h" /* Yeah! If you want to use msg, you need to include msg/msg.h */ +#include "simgrid/msg.h" /* Yeah! If you want to use msg, you need to include simgrid/msg.h */ #include "xbt/sysdep.h" /* calloc, printf */ #include "mpi.h" /* Create a log channel to have nice outputs. */ #include "xbt/log.h" #include "xbt/asserts.h" -#include "smpi/private.h" XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test, "Messages specific for this msg example"); @@ -113,10 +112,10 @@ int alltoall_mpi(int argc, char *argv[]) int slave(int argc, char *argv[]) { msg_task_t task = NULL; - _XBT_GNUC_UNUSED int res; + XBT_ATTRIB_UNUSED int res; int id = -1; char mailbox[80]; - _XBT_GNUC_UNUSED int read; + XBT_ATTRIB_UNUSED int read; read = sscanf(argv[1], "%d", &id); xbt_assert(read, "Invalid argument %s\n", argv[1]); @@ -160,7 +159,6 @@ int main(int argc, char *argv[]) platform_file = argv[1]; application_file = argv[2]; - /* MSG_config("workstation/model","KCCFLN05"); */ { /* Simulation setting */ MSG_create_environment(platform_file); }