From: Frederic Suter Date: Tue, 7 Mar 2017 08:56:15 +0000 (+0100) Subject: Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid X-Git-Tag: v3_15~211 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/1acdb6e20d63bf8987e6fbcf65e40949831a206d?hp=c8a8ad6adbbd82cb0a9c145b0ac9f563ad62775d Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid --- diff --git a/ChangeLog b/ChangeLog index b7af4deefe..34328602e5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -60,6 +60,7 @@ SimGrid (3.15) UNRELEASED; urgency=low XML - A can now be created with different speed values to represent pstates. see examples/platforms/energy_cluster.xml for an example. + -- target_date=March 20 2017 -- Da SimGrid team SimGrid (3.14.159) stable; urgency=low diff --git a/NEWS b/NEWS index 89a7166c4e..08c2fa55e5 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,16 @@ + _ _____ _ ____ +__ _____ _ __ ___(_) ___ _ __ |___ / / | ___| +\ \ / / _ \ '__/ __| |/ _ \| '_ \ |_ \ | |___ \ + \ V / __/ | \__ \ | (_) | | | | ___) || |___) | + \_/ \___|_| |___/_|\___/|_| |_| |____(_)_|____/ + (not released yet) + +The Ever Green Release. + * Continuous integration tasks are green (no more transient errors) + * S4U pushed further, integrating more parts of SimDag. + * Start converting the SMPI internals to C++ too. TBC. + * Plus the usual bug fixes, cleanups and documentation improvements _ _____ _ _ _ _ ____ ___ __ _____ _ __ ___(_) ___ _ __ |___ / / | || | / | ___|/ _ \ \ \ / / _ \ '__/ __| |/ _ \| '_ \ |_ \ | | || |_ | |___ \ (_) | diff --git a/include/xbt/config.h b/include/xbt/config.h index aa14952d10..fa0b5d4ecc 100644 --- a/include/xbt/config.h +++ b/include/xbt/config.h @@ -1,18 +1,16 @@ -/* config - Dictionary where the type of each cell is provided. */ - +/* config - Dictionary where the type of each cell is provided. */ /* This is useful to build named structs, like option or property sets. */ -/* Copyright (c) 2004-2007, 2009-2014. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2004-2017. 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. */ -#ifndef _XBT_CONFIG_H_ -#define _XBT_CONFIG_H_ +#ifndef XBT_CONFIG_H +#define XBT_CONFIG_H -#include "xbt/dynar.h" #include +#include SG_BEGIN_DECL() @@ -145,4 +143,4 @@ XBT_PUBLIC(int) xbt_cfg_get_boolean(const char *name); /** @} */ SG_END_DECL() -#endif /* _XBT_CONFIG_H_ */ +#endif /* XBT_CONFIG_H */ diff --git a/include/xbt/config.hpp b/include/xbt/config.hpp index 8200bf06c6..4e0e22221f 100644 --- a/include/xbt/config.hpp +++ b/include/xbt/config.hpp @@ -1,11 +1,10 @@ -/* Copyright (c) 2016. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2016-2017. 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. */ -#ifndef _XBT_CONFIG_HPP_ -#define _XBT_CONFIG_HPP_ +#ifndef XBT_CONFIG_HPP +#define XBT_CONFIG_HPP #include diff --git a/include/xbt/cunit.h b/include/xbt/cunit.h index 6bfa6a0d40..cf7a3ec212 100644 --- a/include/xbt/cunit.h +++ b/include/xbt/cunit.h @@ -1,15 +1,14 @@ /* cunit - A little C Unit facility */ -/* Copyright (c) 2005-2014. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2005-2017. 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. */ /* This is partially inspired from the OSSP ts (Test Suite Library) */ -#ifndef _XBT_CUNIT_H_ -#define _XBT_CUNIT_H_ +#ifndef XBT_CUNIT_H_ +#define XBT_CUNIT_H_ #include "xbt/sysdep.h" /* XBT_GNU_PRINTF */ #include "xbt/ex.h" @@ -137,4 +136,4 @@ XBT_PUBLIC(void) xbt_test_skip(); /** @} */ SG_END_DECL() -#endif /* _XBT_CUNIT_H_ */ +#endif /* XBT_CUNIT_H_ */ diff --git a/include/xbt/dict.h b/include/xbt/dict.h index 4f6e0615aa..f1eb29e208 100644 --- a/include/xbt/dict.h +++ b/include/xbt/dict.h @@ -1,13 +1,12 @@ /* xbt/dict.h -- api to a generic dictionary */ -/* Copyright (c) 2004-2014. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2004-2017. 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. */ -#ifndef _XBT_DICT_H -#define _XBT_DICT_H +#ifndef XBT_DICT_H +#define XBT_DICT_H #include "xbt/misc.h" /* SG_BEGIN_DECL */ #include "xbt/dynar.h" /* void_f_pvoid_t */ @@ -175,4 +174,4 @@ xbt_dict_foreach(head, cursor, key, data) { SG_END_DECL() -#endif /* _XBT_DICT_H */ +#endif /* XBT_DICT_H */ diff --git a/include/xbt/dynar.h b/include/xbt/dynar.h index 9be1816ee0..747e3185a6 100644 --- a/include/xbt/dynar.h +++ b/include/xbt/dynar.h @@ -1,18 +1,17 @@ /* dynar - a generic dynamic array */ -/* Copyright (c) 2004-2007, 2009-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2004-2017. 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. */ -#ifndef _XBT_DYNAR_H -#define _XBT_DYNAR_H +#ifndef XBT_DYNAR_H +#define XBT_DYNAR_H #include /* memcpy */ -#include "xbt/base.h" /* SG_BEGIN_DECL */ -#include "xbt/function_types.h" +#include /* SG_BEGIN_DECL */ +#include SG_BEGIN_DECL() @@ -262,4 +261,4 @@ xbt_dynar_foreach (dyn,cpt,str) { /** @} */ SG_END_DECL() -#endif /* _XBT_DYNAR_H */ +#endif /* XBT_DYNAR_H */ diff --git a/include/xbt/graph.h b/include/xbt/graph.h index fa192a0042..52087eba2f 100644 --- a/include/xbt/graph.h +++ b/include/xbt/graph.h @@ -1,11 +1,10 @@ -/* Copyright (c) 2006-2007, 2009-2014. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2006-2017. 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. */ -#ifndef _XBT_GRAPH_H -#define _XBT_GRAPH_H +#ifndef XBT_GRAPH_H +#define XBT_GRAPH_H #include "xbt/misc.h" /* SG_BEGIN_DECL */ #include "xbt/dynar.h" SG_BEGIN_DECL() @@ -84,5 +83,5 @@ XBT_PUBLIC(void) xbt_graph_export_graphviz(xbt_graph_t g, const char *filename, const char *(node_name) (xbt_node_t), const char *(edge_name) (xbt_edge_t)); SG_END_DECL() -#endif /* _XBT_GRAPH_H */ +#endif /* XBT_GRAPH_H */ /** @} */ diff --git a/include/xbt/module.h b/include/xbt/module.h index 398e9f77b2..7e00a6fe41 100644 --- a/include/xbt/module.h +++ b/include/xbt/module.h @@ -1,7 +1,6 @@ /* module - modularize the code */ -/* Copyright (c) 2004-2007, 2009-2010, 2012-2014. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2004-2017. 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. */ @@ -17,4 +16,4 @@ XBT_PUBLIC(void) xbt_init(int *argc, char **argv); SG_END_DECL() -#endif /* _XBT_MODULE_H */ +#endif /* XBT_MODULE_H */ diff --git a/include/xbt/swag.h b/include/xbt/swag.h index a0f6b3e759..5c1ff355ab 100644 --- a/include/xbt/swag.h +++ b/include/xbt/swag.h @@ -1,5 +1,4 @@ -/* Copyright (c) 2004-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2004-2017. 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. */ @@ -7,8 +6,8 @@ /* Warning, this module is done to be efficient and performs tons of cast and dirty things. So avoid using it unless * you really know what you are doing. */ -#ifndef _XBT_SWAG_H -#define _XBT_SWAG_H +#ifndef XBT_SWAG_H +#define XBT_SWAG_H #include "xbt/misc.h" #include "xbt/sysdep.h" /* size_t */ @@ -195,4 +194,4 @@ static inline void *xbt_swag_getFirst(xbt_swag_t swag) SG_END_DECL() -#endif /* _XBT_SWAG_H */ +#endif /* XBT_SWAG_H */ diff --git a/include/xbt/virtu.h b/include/xbt/virtu.h index 07b895d283..6c1569643b 100644 --- a/include/xbt/virtu.h +++ b/include/xbt/virtu.h @@ -1,13 +1,12 @@ -/* virtu - virtualization layer for XBT to choose between GRAS and MSG implementation */ +/* virtu - virtualization layer for the logging to know about the actors */ -/* Copyright (c) 2007, 2009-2010, 2012-2014. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2007-2014. 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. */ -#ifndef __XBT_VIRTU_H__ -#define __XBT_VIRTU_H__ +#ifndef XBT_VIRTU_H +#define XBT_VIRTU_H #include "xbt/misc.h" #include "xbt/base.h" @@ -26,4 +25,4 @@ XBT_PUBLIC_DATA(char*) xbt_binary_name; XBT_PUBLIC_DATA(xbt_dynar_t) xbt_cmdline; SG_END_DECL() -#endif /* __XBT_VIRTU_H__ */ +#endif /* XBT_VIRTU_H */ diff --git a/include/xbt/xbt_os_thread.h b/include/xbt/xbt_os_thread.h index ecc6fa77a0..889026389b 100644 --- a/include/xbt/xbt_os_thread.h +++ b/include/xbt/xbt_os_thread.h @@ -1,13 +1,12 @@ /* xbt/xbt_os_thread.h -- Thread portability layer */ -/* Copyright (c) 2007-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2007-2017. 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. */ -#ifndef _XBT_OS_THREAD_H -#define _XBT_OS_THREAD_H +#ifndef XBT_OS_THREAD_H +#define XBT_OS_THREAD_H #include "xbt/base.h" @@ -74,4 +73,4 @@ XBT_PUBLIC(void) xbt_os_sem_destroy(xbt_os_sem_t sem); /** @} */ SG_END_DECL() -#endif /* _XBT_OS_THREAD_H */ +#endif /* XBT_OS_THREAD_H */ diff --git a/include/xbt/xbt_os_time.h b/include/xbt/xbt_os_time.h index b9d9b46b92..0d3fa3cfe8 100644 --- a/include/xbt/xbt_os_time.h +++ b/include/xbt/xbt_os_time.h @@ -1,7 +1,6 @@ /* xbt/xbt_os_timer.h -- system dependency on time functions */ -/* Copyright (c) 2007, 2009-2010, 2012-2014. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2007-2017. 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. */ diff --git a/src/bindings/java/jtrace.h b/src/bindings/java/jtrace.h index adfe45c376..04c582ab0f 100644 --- a/src/bindings/java/jtrace.h +++ b/src/bindings/java/jtrace.h @@ -8,8 +8,8 @@ #include /* Header for class org_simgrid_trace_Trace */ -#ifndef _Included_org_simgrid_trace_Trace -#define _Included_org_simgrid_trace_Trace +#ifndef Included_org_simgrid_trace_Trace +#define Included_org_simgrid_trace_Trace /* Shut up some errors in eclipse online compiler. I wish such a pimple wouldn't be needed */ #ifndef JNIEXPORT diff --git a/src/include/mc/mc.h b/src/include/mc/mc.h index 2d37e156a9..b306717bf3 100644 --- a/src/include/mc/mc.h +++ b/src/include/mc/mc.h @@ -1,11 +1,10 @@ -/* Copyright (c) 2008-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2008-2017. 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. */ -#ifndef _MC_MC_H -#define _MC_MC_H +#ifndef MC_MC_H +#define MC_MC_H #include #include @@ -83,4 +82,4 @@ XBT_PUBLIC(void) MC_memory_init_server(); SG_END_DECL() -#endif /* _MC_MC_H */ +#endif /* MC_MC_H */ diff --git a/src/include/smpi/smpi_interface.h b/src/include/smpi/smpi_interface.h index d012318883..f9512d9499 100644 --- a/src/include/smpi/smpi_interface.h +++ b/src/include/smpi/smpi_interface.h @@ -1,11 +1,10 @@ -/* Copyright (c) 2012-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2012-2017. 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. */ -#ifndef _SMPI_INTERFACE_H -#define _SMPI_INTERFACE_H +#ifndef SMPI_INTERFACE_H +#define SMPI_INTERFACE_H #include "smpi/smpi.h" SG_BEGIN_DECL() @@ -99,4 +98,4 @@ XBT_PUBLIC(void) smpi_coll_cleanup_mvapich2(void); SG_END_DECL() -#endif /* _SMPI_INTERFAC_H */ +#endif /* SMPI_INTERFACE_H */ diff --git a/src/include/smpi/smpi_utils.hpp b/src/include/smpi/smpi_utils.hpp index 8eaaa0c74d..0f98f38a44 100644 --- a/src/include/smpi/smpi_utils.hpp +++ b/src/include/smpi/smpi_utils.hpp @@ -1,11 +1,10 @@ -/* Copyright (c) 2016. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2016-2017. 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. */ -#ifndef _SMPI_UTILS_HPP -#define _SMPI_UTILS_HPP +#ifndef SMPI_UTILS_HPP +#define SMPI_UTILS_HPP #include "xbt/base.h" #include #include diff --git a/src/include/surf/maxmin.h b/src/include/surf/maxmin.h index 9698c0fed6..393d3dda28 100644 --- a/src/include/surf/maxmin.h +++ b/src/include/surf/maxmin.h @@ -1,11 +1,10 @@ -/* Copyright (c) 2004-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2004-2017. 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. */ -#ifndef _SURF_MAXMIN_H -#define _SURF_MAXMIN_H +#ifndef SURF_MAXMIN_H +#define SURF_MAXMIN_H #include "src/internal_config.h" #include "xbt/misc.h" @@ -453,4 +452,4 @@ XBT_PUBLIC(double func_vegas_fpi) (lmm_variable_t var, double x); /** @} */ SG_END_DECL() -#endif /* _SURF_MAXMIN_H */ +#endif /* SURF_MAXMIN_H */ diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h index addf3d5af3..24cc024d86 100644 --- a/src/include/surf/surf.h +++ b/src/include/surf/surf.h @@ -1,11 +1,10 @@ -/* Copyright (c) 2004-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2004-2017. 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. */ -#ifndef _SURF_SURF_H -#define _SURF_SURF_H +#ifndef SURF_SURF_H +#define SURF_SURF_H #include "xbt/swag.h" #include "xbt/dynar.h" @@ -659,4 +658,4 @@ xbt_graph_t instr_routing_platform_graph (); void instr_routing_platform_graph_export_graphviz (xbt_graph_t g, const char *filename); SG_END_DECL() -#endif /* _SURF_SURF_H */ +#endif /* SURF_SURF_H */ diff --git a/src/kernel/activity/SynchroComm.hpp b/src/kernel/activity/SynchroComm.hpp index 37a4b96052..7a56db936f 100644 --- a/src/kernel/activity/SynchroComm.hpp +++ b/src/kernel/activity/SynchroComm.hpp @@ -1,10 +1,10 @@ -/* Copyright (c) 2007-2016. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2017. 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. */ -#ifndef _SIMIX_SYNCHRO_COMM_HPP -#define _SIMIX_SYNCHRO_COMM_HPP +#ifndef SIMIX_SYNCHRO_COMM_HPP +#define SIMIX_SYNCHRO_COMM_HPP #include "surf/surf.h" #include "src/kernel/activity/ActivityImpl.hpp" diff --git a/src/kernel/activity/SynchroExec.hpp b/src/kernel/activity/SynchroExec.hpp index 9269975d17..ad3e1fa72a 100644 --- a/src/kernel/activity/SynchroExec.hpp +++ b/src/kernel/activity/SynchroExec.hpp @@ -1,10 +1,10 @@ -/* Copyright (c) 2007-2016. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2017. 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. */ -#ifndef _SIMIX_SYNCHRO_EXEC_HPP -#define _SIMIX_SYNCHRO_EXEC_HPP +#ifndef SIMIX_SYNCHRO_EXEC_HPP +#define SIMIX_SYNCHRO_EXEC_HPP #include "surf/surf.h" #include "src/kernel/activity/ActivityImpl.hpp" diff --git a/src/kernel/activity/SynchroIo.hpp b/src/kernel/activity/SynchroIo.hpp index 59f307f22a..b9c405daa3 100644 --- a/src/kernel/activity/SynchroIo.hpp +++ b/src/kernel/activity/SynchroIo.hpp @@ -1,10 +1,10 @@ -/* Copyright (c) 2007-2016. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2017. 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. */ -#ifndef _SIMIX_SYNCHRO_IO_HPP -#define _SIMIX_SYNCHRO_IO_HPP +#ifndef SIMIX_SYNCHRO_IO_HPP +#define SIMIX_SYNCHRO_IO_HPP #include "surf/surf.h" #include "src/kernel/activity/ActivityImpl.hpp" diff --git a/src/kernel/activity/SynchroRaw.hpp b/src/kernel/activity/SynchroRaw.hpp index 035d295b97..b85e06f638 100644 --- a/src/kernel/activity/SynchroRaw.hpp +++ b/src/kernel/activity/SynchroRaw.hpp @@ -1,10 +1,10 @@ -/* Copyright (c) 2007-2016. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2017. 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. */ -#ifndef _SIMIX_SYNCHRO_RAW_HPP -#define _SIMIX_SYNCHRO_RAW_HPP +#ifndef SIMIX_SYNCHRO_RAW_HPP +#define SIMIX_SYNCHRO_RAW_HPP #include "surf/surf.h" #include "src/kernel/activity/ActivityImpl.hpp" diff --git a/src/kernel/activity/SynchroSleep.hpp b/src/kernel/activity/SynchroSleep.hpp index 0edef6337e..aca0471ef7 100644 --- a/src/kernel/activity/SynchroSleep.hpp +++ b/src/kernel/activity/SynchroSleep.hpp @@ -1,10 +1,10 @@ -/* Copyright (c) 2007-2016. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2017. 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. */ -#ifndef _SIMIX_SYNCHRO_SLEEP_HPP -#define _SIMIX_SYNCHRO_SLEEP_HPP +#ifndef SIMIX_SYNCHRO_SLEEP_HPP +#define SIMIX_SYNCHRO_SLEEP_HPP #include "surf/surf.h" #include "src/kernel/activity/ActivityImpl.hpp" diff --git a/src/kernel/context/Context.hpp b/src/kernel/context/Context.hpp index 1bbcd8b0a7..fec402efdf 100644 --- a/src/kernel/context/Context.hpp +++ b/src/kernel/context/Context.hpp @@ -1,10 +1,10 @@ -/* Copyright (c) 2007-2016. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2017. 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. */ -#ifndef _SIMGRID_KERNEL_CONTEXT_CONTEXT_HPP -#define _SIMGRID_KERNEL_CONTEXT_CONTEXT_HPP +#ifndef SIMGRID_KERNEL_CONTEXT_CONTEXT_HPP +#define SIMGRID_KERNEL_CONTEXT_CONTEXT_HPP #include #include @@ -23,7 +23,6 @@ #include "xbt/config.h" #include "xbt/xbt_os_time.h" #include "xbt/function_types.h" -#include "src/xbt/ex_interface.h" #include "src/instr/instr_private.h" #include "src/simix/smx_host_private.h" #include "src/simix/smx_io_private.h" diff --git a/src/mc/compare.cpp b/src/mc/compare.cpp index e7b5ada5ea..404b384591 100644 --- a/src/mc/compare.cpp +++ b/src/mc/compare.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2008-2016. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2008-2017. 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. */ @@ -23,7 +23,6 @@ #include "src/internal_config.h" #include "src/xbt/mmalloc/mmprivate.h" -#include "src/xbt/ex_interface.h" #if HAVE_SMPI #include "src/smpi/private.h" diff --git a/src/mc/mc_base.cpp b/src/mc/mc_base.cpp index e6e2a7797d..cc57a3cc8e 100644 --- a/src/mc/mc_base.cpp +++ b/src/mc/mc_base.cpp @@ -1,5 +1,4 @@ -/* Copyright (c) 2008-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2008-2017. 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. */ @@ -32,9 +31,7 @@ #include "src/mc/Process.hpp" #include "src/mc/ModelChecker.hpp" #include "src/mc/mc_smx.h" -#endif -#if HAVE_MC using simgrid::mc::remote; #endif diff --git a/src/mc/mc_global.cpp b/src/mc/mc_global.cpp index e62b9c659f..1d4dd5f7c6 100644 --- a/src/mc/mc_global.cpp +++ b/src/mc/mc_global.cpp @@ -1,5 +1,4 @@ -/* Copyright (c) 2008-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2008-2017. 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. */ diff --git a/src/simix/ActorImpl.hpp b/src/simix/ActorImpl.hpp index 4464b6196b..5986a190ee 100644 --- a/src/simix/ActorImpl.hpp +++ b/src/simix/ActorImpl.hpp @@ -3,8 +3,8 @@ /* 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. */ -#ifndef _SIMIX_ACTORIMPL_H -#define _SIMIX_ACTORIMPL_H +#ifndef SIMIX_ACTORIMPL_H +#define SIMIX_ACTORIMPL_H #include "simgrid/s4u/Actor.hpp" #include "src/simix/popping_private.h" diff --git a/src/simix/popping_private.h b/src/simix/popping_private.h index 542adbff4d..abbc7566cf 100644 --- a/src/simix/popping_private.h +++ b/src/simix/popping_private.h @@ -1,11 +1,10 @@ -/* Copyright (c) 2007-2010, 2012-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2007-2017. 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. */ -#ifndef _POPPING_PRIVATE_H -#define _POPPING_PRIVATE_H +#ifndef SG_POPPING_PRIVATE_H +#define SG_POPPING_PRIVATE_H #include #include diff --git a/src/simix/smx_context.cpp b/src/simix/smx_context.cpp index 2edefd4031..b3824614f8 100644 --- a/src/simix/smx_context.cpp +++ b/src/simix/smx_context.cpp @@ -1,7 +1,6 @@ /* a fast and simple context switching library */ -/* Copyright (c) 2009-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2009-2017. 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. */ diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp index e94f3cbaea..184472573a 100644 --- a/src/simix/smx_global.cpp +++ b/src/simix/smx_global.cpp @@ -1,5 +1,4 @@ -/* Copyright (c) 2007-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2007-2017. 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. */ diff --git a/src/simix/smx_host_private.h b/src/simix/smx_host_private.h index 72a46ccaf6..7b85ee2e1b 100644 --- a/src/simix/smx_host_private.h +++ b/src/simix/smx_host_private.h @@ -1,11 +1,10 @@ -/* Copyright (c) 2007-2010, 2012-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2007-2017. 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. */ -#ifndef _SIMIX_HOST_PRIVATE_H -#define _SIMIX_HOST_PRIVATE_H +#ifndef SIMIX_HOST_PRIVATE_H +#define SIMIX_HOST_PRIVATE_H #include #include diff --git a/src/simix/smx_io_private.h b/src/simix/smx_io_private.h index d518efd37d..b0079cd244 100644 --- a/src/simix/smx_io_private.h +++ b/src/simix/smx_io_private.h @@ -1,11 +1,10 @@ -/* Copyright (c) 2007-2010, 2012-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2007-2017. 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. */ -#ifndef _SIMIX_IO_PRIVATE_H -#define _SIMIX_IO_PRIVATE_H +#ifndef SIMIX_IO_PRIVATE_H +#define SIMIX_IO_PRIVATE_H #include diff --git a/src/simix/smx_network_private.h b/src/simix/smx_network_private.h index c238e2e298..c3a0c3444a 100644 --- a/src/simix/smx_network_private.h +++ b/src/simix/smx_network_private.h @@ -1,11 +1,10 @@ -/* Copyright (c) 2007-2010, 2012-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2007-2017. 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. */ -#ifndef _SIMIX_NETWORK_PRIVATE_H -#define _SIMIX_NETWORK_PRIVATE_H +#ifndef SIMIX_NETWORK_PRIVATE_H +#define SIMIX_NETWORK_PRIVATE_H #include "simgrid/s4u/Mailbox.hpp" #include "src/kernel/activity/MailboxImpl.hpp" diff --git a/src/simix/smx_private.h b/src/simix/smx_private.h index 83f295a47c..f0072b96e0 100644 --- a/src/simix/smx_private.h +++ b/src/simix/smx_private.h @@ -1,11 +1,10 @@ -/* Copyright (c) 2007-2010, 2012-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2007-2017. 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. */ -#ifndef _SIMIX_PRIVATE_H -#define _SIMIX_PRIVATE_H +#ifndef SIMIX_PRIVATE_H +#define SIMIX_PRIVATE_H #include #include "src/kernel/context/Context.hpp" diff --git a/src/simix/smx_synchro_private.h b/src/simix/smx_synchro_private.h index a8c4dadac2..c7f882b565 100644 --- a/src/simix/smx_synchro_private.h +++ b/src/simix/smx_synchro_private.h @@ -3,8 +3,8 @@ /* 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. */ -#ifndef _SIMIX_SYNCHRO_PRIVATE_H -#define _SIMIX_SYNCHRO_PRIVATE_H +#ifndef SIMIX_SYNCHRO_PRIVATE_H +#define SIMIX_SYNCHRO_PRIVATE_H #include "simgrid/s4u/conditionVariable.hpp" #include "xbt/swag.h" @@ -83,4 +83,5 @@ XBT_PRIVATE XBT_PRIVATE smx_sem_t SIMIX_sem_init(unsigned int value); XBT_PRIVATE void SIMIX_sem_release(smx_sem_t sem); XBT_PRIVATE int SIMIX_sem_would_block(smx_sem_t sem); XBT_PRIVATE int SIMIX_sem_get_capacity(smx_sem_t sem); + #endif diff --git a/src/surf/maxmin_private.hpp b/src/surf/maxmin_private.hpp index eabf183b9e..8c8bfbb8f9 100644 --- a/src/surf/maxmin_private.hpp +++ b/src/surf/maxmin_private.hpp @@ -1,11 +1,10 @@ -/* Copyright (c) 2004-2014. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2004-2017. 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. */ -#ifndef _SURF_MAXMIN_PRIVATE_H -#define _SURF_MAXMIN_PRIVATE_H +#ifndef SURF_MAXMIN_PRIVATE_H +#define SURF_MAXMIN_PRIVATE_H #include "surf/maxmin.h" #include "xbt/swag.h" @@ -146,6 +145,4 @@ extern XBT_PRIVATE double (*func_f_def) (lmm_variable_t, double); extern XBT_PRIVATE double (*func_fp_def) (lmm_variable_t, double); extern XBT_PRIVATE double (*func_fpi_def) (lmm_variable_t, double); -#endif /* _SURF_MAXMIN_PRIVATE_H */ - - +#endif /* SURF_MAXMIN_PRIVATE_H */ diff --git a/src/surf/ns3/ns3_interface.h b/src/surf/ns3/ns3_interface.h index 4603ebc373..e667adec78 100644 --- a/src/surf/ns3/ns3_interface.h +++ b/src/surf/ns3/ns3_interface.h @@ -1,10 +1,10 @@ -/* Copyright (c) 2007-2016. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2017. 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. */ -#ifndef _NS3_INTERFACE_H -#define _NS3_INTERFACE_H +#ifndef NS3_INTERFACE_H +#define NS3_INTERFACE_H #include diff --git a/src/surf/ns3/ns3_simulator.h b/src/surf/ns3/ns3_simulator.h index 2847a6037f..a72264e125 100644 --- a/src/surf/ns3/ns3_simulator.h +++ b/src/surf/ns3/ns3_simulator.h @@ -1,11 +1,10 @@ -/* Copyright (c) 2007-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2007-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. */ -#ifndef _NS3_SIM_H -#define _NS3_SIM_H +#ifndef NS3_SIM_H +#define NS3_SIM_H #include diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h index 0e594097fe..c7f25d9011 100644 --- a/src/surf/surf_private.h +++ b/src/surf/surf_private.h @@ -1,10 +1,10 @@ -/* Copyright (c) 2004-2016. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2004-2017. 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. */ -#ifndef _SURF_SURF_PRIVATE_H -#define _SURF_SURF_PRIVATE_H +#ifndef SURF_SURF_PRIVATE_H +#define SURF_SURF_PRIVATE_H #include "surf/surf.h" #include "surf/maxmin.h" @@ -55,4 +55,4 @@ void TRACE_surf_link_set_bandwidth(double date, const char *resource, double ban SG_END_DECL() -#endif /* _SURF_SURF_PRIVATE_H */ +#endif /* SURF_SURF_PRIVATE_H */ diff --git a/src/surf/surf_routing.cpp b/src/surf/surf_routing.cpp deleted file mode 100644 index 1bf0d25ee7..0000000000 --- a/src/surf/surf_routing.cpp +++ /dev/null @@ -1,7 +0,0 @@ -/* Copyright (c) 2009-2016. 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 "xbt/dict.h" - diff --git a/src/surf/trace_mgr.hpp b/src/surf/trace_mgr.hpp index bf4519912d..3260d6688b 100644 --- a/src/surf/trace_mgr.hpp +++ b/src/surf/trace_mgr.hpp @@ -1,11 +1,10 @@ -/* Copyright (c) 2004-2007, 2009-2014. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2004-2017. 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. */ -#ifndef _SURF_TMGR_H -#define _SURF_TMGR_H +#ifndef SURF_TMGR_H +#define SURF_TMGR_H #include "xbt/heap.h" #include "simgrid/forward.h" @@ -94,4 +93,4 @@ private: }} // namespace simgrid::trace_mgr #endif /* C++ only */ -#endif /* _SURF_TMGR_H */ +#endif /* SURF_TMGR_H */ diff --git a/src/surf/xml/platf.hpp b/src/surf/xml/platf.hpp index 8c9f25a6a6..3804abae4d 100644 --- a/src/surf/xml/platf.hpp +++ b/src/surf/xml/platf.hpp @@ -1,11 +1,10 @@ -/* Copyright (c) 2006-2014. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2006-2017. 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. */ -#ifndef _SURF_SURFXML_PARSE_H -#define _SURF_SURFXML_PARSE_H +#ifndef SURF_SURFXML_PARSE_H +#define SURF_SURFXML_PARSE_H #include #include diff --git a/src/xbt/backtrace_dummy.cpp b/src/xbt/backtrace_dummy.cpp index 439686cebe..a9e82463d9 100644 --- a/src/xbt/backtrace_dummy.cpp +++ b/src/xbt/backtrace_dummy.cpp @@ -1,14 +1,12 @@ /* backtrace_dummy -- stubs of this module for non-supported archs */ -/* Copyright (c) 2008-2014. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2008-2017. 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 "xbt/ex.h" #include "src/xbt_modinter.h" -#include "src/xbt/ex_interface.h" #include diff --git a/src/xbt/backtrace_linux.cpp b/src/xbt/backtrace_linux.cpp index e3ec64071d..cb8ef6d1cb 100644 --- a/src/xbt/backtrace_linux.cpp +++ b/src/xbt/backtrace_linux.cpp @@ -1,8 +1,7 @@ /* backtrace_linux - backtrace displaying on linux platform */ /* This file is included by ex.cpp on need (have execinfo.h, popen & addrline)*/ -/* Copyright (c) 2008-2016. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2008-2017. 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. */ @@ -21,7 +20,6 @@ #include #include #include "xbt/ex.h" -#include "src/xbt/ex_interface.h" #include "xbt/log.h" #include "xbt/str.h" #include "xbt/module.h" /* xbt_binary_name */ diff --git a/src/xbt/dict_private.h b/src/xbt/dict_private.h index 0b4e57fddb..dd21a45996 100644 --- a/src/xbt/dict_private.h +++ b/src/xbt/dict_private.h @@ -1,14 +1,13 @@ /* dict_elm - elements of generic dictionnaries */ -/* This file is not to be loaded from anywhere but dict.cpp */ +/* This file is not to be loaded from anywhere but dict.cpp */ -/* Copyright (c) 2004-2011, 2013-2014. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2004-2017. 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. */ -#ifndef _XBT_DICT_PRIVATE_H__ -#define _XBT_DICT_PRIVATE_H__ +#ifndef XBT_DICT_PRIVATE_H +#define XBT_DICT_PRIVATE_H #include "xbt/base.h" #include "xbt/sysdep.h" @@ -56,4 +55,4 @@ XBT_PRIVATE void xbt_dictelm_set_data(xbt_dict_t dict, xbt_dictelm_t element, vo SG_END_DECL() -#endif /* _XBT_DICT_PRIVATE_H_ */ +#endif /* XBT_DICT_PRIVATE_H */ diff --git a/src/xbt/ex.cpp b/src/xbt/ex.cpp index da1dc698b4..f6db218437 100644 --- a/src/xbt/ex.cpp +++ b/src/xbt/ex.cpp @@ -1,7 +1,6 @@ /* ex - Exception Handling */ -/* Copyright (c) 2005-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2005-2017. The SimGrid Team. All rights reserved. */ /* Copyright (c) 2002-2004 Ralf S. Engelschall */ /* Copyright (c) 2002-2004 The OSSP Project */ @@ -56,7 +55,6 @@ #include "xbt/str.h" #include "src/xbt_modinter.h" /* backtrace initialization headers */ -#include "src/xbt/ex_interface.h" #include "simgrid/sg_config.h" /* Configuration mechanism of SimGrid */ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_ex, xbt, "Exception mechanism"); diff --git a/src/xbt/ex_interface.h b/src/xbt/ex_interface.h deleted file mode 100644 index 3c7599e5f3..0000000000 --- a/src/xbt/ex_interface.h +++ /dev/null @@ -1,28 +0,0 @@ -/* ex -- exception handling */ -/* This file is to loaded in any location defining exception handlers */ -/* (such as context.c), to exchange them. */ - -/* Copyright (c) 2006-2007, 2009-2010, 2012-2014. 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. */ - -#ifndef _XBT_EX_INTERFACE_H_ -#define _XBT_EX_INTERFACE_H_ - -#include - -#include -#include - -#include "xbt/base.h" -#include "xbt/backtrace.h" - -namespace simgrid { -namespace xbt { - -} -} - -#endif /* _XBT_EX_INTERFACE_H_ */ diff --git a/src/xbt/graph_private.h b/src/xbt/graph_private.h index 3fc579145c..1f2887e396 100644 --- a/src/xbt/graph_private.h +++ b/src/xbt/graph_private.h @@ -1,11 +1,10 @@ -/* Copyright (c) 2006, 2009-2010, 2012-2014. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2006-2017. 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. */ -#ifndef _XBT_GRAPH_PRIVATE_H -#define _XBT_GRAPH_PRIVATE_H +#ifndef XBT_GRAPH_PRIVATE_H +#define XBT_GRAPH_PRIVATE_H #include "xbt/base.h" #include "xbt/dynar.h" @@ -13,4 +12,4 @@ XBT_PRIVATE void xbt_floyd_algorithm(xbt_graph_t g, double *adj, double *d, xbt_node_t * p); -#endif /* _XBT_GRAPH_PRIVATE_H */ +#endif /* XBT_GRAPH_PRIVATE_H */ diff --git a/src/xbt/heap_private.h b/src/xbt/heap_private.h index 0186ee1e58..aa47023592 100644 --- a/src/xbt/heap_private.h +++ b/src/xbt/heap_private.h @@ -1,15 +1,14 @@ -/* Copyright (c) 2004-2005, 2007, 2009-2014. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2004-2017. 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. */ -#ifndef _XBT_HEAP_PRIVATE_H -#define _XBT_HEAP_PRIVATE_H +#ifndef XBT_HEAP_PRIVATE_H +#define XBT_HEAP_PRIVATE_H -#include "xbt/dynar.h" /* void_f_pvoid_t */ -#include "xbt/heap.h" #include +#include +#include typedef struct xbt_heap_item { void *content; @@ -33,4 +32,4 @@ typedef struct xbt_heap { #define MIN_KEY_VALUE -DBL_MAX -#endif /* _XBT_HEAP_PRIVATE_H */ +#endif /* XBT_HEAP_PRIVATE_H */ diff --git a/src/xbt/mallocator_private.h b/src/xbt/mallocator_private.h index 3bc4d8c971..ec34658171 100644 --- a/src/xbt/mallocator_private.h +++ b/src/xbt/mallocator_private.h @@ -1,13 +1,12 @@ /* mallocator - recycle objects to avoid malloc() / free() */ -/* Copyright (c) 2006-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2006-2017. 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. */ -#ifndef _XBT_MALLOCATOR_PRIVATE_H__ -#define _XBT_MALLOCATOR_PRIVATE_H__ +#ifndef XBT_MALLOCATOR_PRIVATE_H +#define XBT_MALLOCATOR_PRIVATE_H #include @@ -21,4 +20,4 @@ typedef struct s_xbt_mallocator { int lock; /* lock to ensure the mallocator is thread-safe */ } s_xbt_mallocator_t; -#endif /* _XBT_MALLOCATOR_PRIVATE_H__ */ +#endif /* XBT_MALLOCATOR_PRIVATE_H */ diff --git a/src/xbt/mmalloc/mmprivate.h b/src/xbt/mmalloc/mmprivate.h index cba3208c04..6171035483 100644 --- a/src/xbt/mmalloc/mmprivate.h +++ b/src/xbt/mmalloc/mmprivate.h @@ -1,7 +1,6 @@ /* Declarations for `mmalloc' and friends. */ -/* Copyright (c) 2010-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2010-2017. 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. */ @@ -11,8 +10,8 @@ Written May 1989 by Mike Haertel. Heavily modified Mar 1992 by Fred Fish. (fnf@cygnus.com) */ -#ifndef __MMPRIVATE_H -#define __MMPRIVATE_H 1 +#ifndef XBR_MMPRIVATE_H +#define XBT_MMPRIVATE_H 1 #include #include @@ -322,4 +321,4 @@ XBT_PRIVATE size_t mmalloc_get_bytes_used_remote(size_t heaplimit, const malloc_ SG_END_DECL() -#endif /* __MMPRIVATE_H */ +#endif /* XBT_MMPRIVATE_H */ diff --git a/src/xbt/parmap.cpp b/src/xbt/parmap.cpp index 074b53cd45..67ed936e31 100644 --- a/src/xbt/parmap.cpp +++ b/src/xbt/parmap.cpp @@ -1,5 +1,4 @@ -/* Copyright (c) 2004-2005, 2007, 2009-2014. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2004-2017. 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. */ diff --git a/src/xbt/xbt_main.cpp b/src/xbt/xbt_main.cpp index 496cc47da9..f04241769a 100644 --- a/src/xbt/xbt_main.cpp +++ b/src/xbt/xbt_main.cpp @@ -1,7 +1,6 @@ /* module handling */ -/* Copyright (c) 2006-2014. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2006-2017. 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. */ diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index f4f901ee8f..2a28a03c6f 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -77,7 +77,6 @@ set(EXTRA_DIST src/xbt/backtrace_dummy.cpp src/xbt/backtrace_linux.cpp src/xbt/dict_private.h - src/xbt/ex_interface.h src/xbt/graph_private.h src/xbt/heap_private.h src/xbt/log_private.h @@ -325,7 +324,6 @@ set(SURF_SRC src/surf/storage_n11.cpp src/surf/surf_c_bindings.cpp src/surf/surf_interface.cpp - src/surf/surf_routing.cpp src/surf/xml/platf.hpp src/surf/xml/platf_private.hpp src/surf/xml/surfxml_sax_cb.cpp