From: Martin Quinson Date: Wed, 8 Mar 2017 09:38:15 +0000 (+0100) Subject: fix copyright years and other psychotic cleanups X-Git-Tag: v3_15~185^2~3 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/ab9a2d2c7dca2b08750d70ef5769fc2c14350ab6?hp=3c2534ab455931a11774905e677e1498815de10c fix copyright years and other psychotic cleanups --- diff --git a/src/bindings/java/jmsg.h b/src/bindings/java/jmsg.h index 747aafe01d..de185402f8 100644 --- a/src/bindings/java/jmsg.h +++ b/src/bindings/java/jmsg.h @@ -49,4 +49,4 @@ JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Msg_environmentGetRoutingRoot(JNI JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_deployApplication(JNIEnv * env, jclass cls, jstring jdeploymentFile); SG_END_DECL() -#endif /* !MSG4JAVA_H */ +#endif diff --git a/src/bindings/java/jmsg_as.h b/src/bindings/java/jmsg_as.h index 8e5f65e4ef..89ac082910 100644 --- a/src/bindings/java/jmsg_as.h +++ b/src/bindings/java/jmsg_as.h @@ -34,4 +34,4 @@ JNIEXPORT jobject JNICALL Java_org_simgrid_msg_As_getProperty(JNIEnv *env, jobje JNIEXPORT jobjectArray JNICALL Java_org_simgrid_msg_As_getHosts(JNIEnv* env, jobject jnetzone); SG_END_DECL() -#endif /*!MSG_JAS_H */ +#endif diff --git a/src/bindings/java/jmsg_comm.h b/src/bindings/java/jmsg_comm.h index a727c2f6a9..dd7bb99d1f 100644 --- a/src/bindings/java/jmsg_comm.h +++ b/src/bindings/java/jmsg_comm.h @@ -36,4 +36,4 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Comm_waitAll(JNIEnv *env, jclass cls JNIEXPORT int JNICALL Java_org_simgrid_msg_Comm_waitAny(JNIEnv *env, jclass cls, jobjectArray jcomms); SG_END_DECL() -#endif /* MSG_JCOMM_H */ +#endif diff --git a/src/bindings/java/jmsg_file.h b/src/bindings/java/jmsg_file.h index d4b509e254..31720a57ab 100644 --- a/src/bindings/java/jmsg_file.h +++ b/src/bindings/java/jmsg_file.h @@ -7,6 +7,7 @@ #ifndef MSG_JFILE_H #define MSG_JFILE_H + #include #include "simgrid/msg.h" diff --git a/src/bindings/java/jmsg_host.h b/src/bindings/java/jmsg_host.h index deebb1641f..ebbc41e868 100644 --- a/src/bindings/java/jmsg_host.h +++ b/src/bindings/java/jmsg_host.h @@ -68,5 +68,4 @@ JNIEXPORT jdouble JNICALL Java_org_simgrid_msg_Host_getCurrentPowerPeak(JNIEnv* JNIEXPORT jdouble JNICALL Java_org_simgrid_msg_Host_getPowerPeakAt(JNIEnv* env, jobject jhost, jint pstate); SG_END_DECL() -#endif /*!MSG_JHOST_H */ - +#endif diff --git a/src/bindings/java/jmsg_process.h b/src/bindings/java/jmsg_process.h index c5e0c513d1..90b449e47e 100644 --- a/src/bindings/java/jmsg_process.h +++ b/src/bindings/java/jmsg_process.h @@ -68,4 +68,4 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_setKillTime(JNIEnv* env, job JNIEXPORT jint JNICALL Java_org_simgrid_msg_Process_getCount(JNIEnv * env, jclass cls); SG_END_DECL(); -#endif /* !MSG_JPROCESS_H */ +#endif diff --git a/src/bindings/java/jmsg_rngstream.h b/src/bindings/java/jmsg_rngstream.h index 0cc952d4eb..cd7f29ff23 100644 --- a/src/bindings/java/jmsg_rngstream.h +++ b/src/bindings/java/jmsg_rngstream.h @@ -39,4 +39,4 @@ JNIEXPORT jdouble JNICALL Java_org_simgrid_msg_RngStream_randU01(JNIEnv *env, jo JNIEXPORT jint JNICALL Java_org_simgrid_msg_RngStream_randInt(JNIEnv *env, jobject jrngstream, jint i, jint j); SG_END_DECL() -#endif /* MSG_RNGSTREAM_H */ +#endif diff --git a/src/bindings/java/jmsg_storage.h b/src/bindings/java/jmsg_storage.h index b8bd820953..ea6dc3651e 100644 --- a/src/bindings/java/jmsg_storage.h +++ b/src/bindings/java/jmsg_storage.h @@ -47,4 +47,4 @@ JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Storage_getHost(JNIEnv * env,jobj JNIEXPORT jobjectArray JNICALL Java_org_simgrid_msg_Storage_all(JNIEnv *env, jclass cls); SG_END_DECL() -#endif /*!MSG_JSTORAGE_H */ +#endif diff --git a/src/bindings/java/jmsg_synchro.h b/src/bindings/java/jmsg_synchro.h index 2e698cb8c5..e70dec1c02 100644 --- a/src/bindings/java/jmsg_synchro.h +++ b/src/bindings/java/jmsg_synchro.h @@ -25,4 +25,4 @@ JNIEXPORT jboolean JNICALL Java_org_simgrid_msg_Semaphore_wouldBlock(JNIEnv * en JNIEXPORT void JNICALL Java_org_simgrid_msg_Semaphore_nativeFinalize(JNIEnv * env, jobject obj); SG_END_DECL() -#endif /* !MSG_JPROCESS_H */ +#endif diff --git a/src/bindings/java/jmsg_task.h b/src/bindings/java/jmsg_task.h index 5587b28f77..a1ef122395 100644 --- a/src/bindings/java/jmsg_task.h +++ b/src/bindings/java/jmsg_task.h @@ -63,4 +63,4 @@ JNIEXPORT jint JNICALL Java_org_simgrid_msg_Task_listenFromHost(JNIEnv* env, jcl JNIEXPORT jint JNICALL Java_org_simgrid_msg_Task_listenFrom(JNIEnv* env, jclass cls, jstring jalias); SG_END_DECL() -#endif /* !MSG_JTASK_H */ +#endif diff --git a/src/bindings/java/jmsg_vm.h b/src/bindings/java/jmsg_vm.h index a0efd27141..bdc66acc69 100644 --- a/src/bindings/java/jmsg_vm.h +++ b/src/bindings/java/jmsg_vm.h @@ -39,90 +39,20 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_nativeInit(JNIEnv *env, jclass cl */ JNIEXPORT jint JNICALL Java_org_simgrid_msg_VM_isCreated(JNIEnv *env, jobject jvm); -/** - * Class org_simgrid_msg_VM - * Method isRunning - * Signature ()B - */ JNIEXPORT jint JNICALL Java_org_simgrid_msg_VM_isRunning(JNIEnv *env, jobject jvm); - -/** - * Class org_simgrid_msg_VM - * Method isMigrating - * Signature ()B - */ JNIEXPORT jint JNICALL Java_org_simgrid_msg_VM_isMigrating(JNIEnv *env, jobject jvm); - -/** - * Class org_simgrid_msg_VM - * Method isSuspended - * Signature ()B - */ JNIEXPORT jint JNICALL Java_org_simgrid_msg_VM_isSuspended(JNIEnv *env, jobject jvm); - -/** - * Class org_simgrid_msg_VM - * Method isResuming - * Signature ()B - */ JNIEXPORT jint JNICALL Java_org_simgrid_msg_VM_isResuming(JNIEnv *env, jobject jvm); - -/** - * Class org_simgrid_msg_VM - * Method setBound - * Signature (D)B - */ JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_setBound(JNIEnv *env, jobject jvm, jdouble bound); - -/** - * Class org_simgrid_msg_VM - * Method create - * Signature ()V - */ JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_create(JNIEnv* env, jobject jvm, jobject jhost, jstring jname, jint jramsize, jint dprate, jint mig_netspeed); - -/** - * Class org_simgrid_msg_VM - * Method destroy - * Signature ()V - */ JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_nativeFinalize(JNIEnv *env, jobject jvm); - -/** - * Class org_simgrid_msg_VM - * Method start - * Signature (I)V - */ JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_start(JNIEnv *env, jobject jvm); - -/** - * Class org_simgrid_msg_VM - * Method nativeMigrate - * Signature (Lorg/simgrid/msg/Host;)V - */ JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_internalmig(JNIEnv *env, jobject jvm, jobject jhost); - -/** - * Class org_simgrid_msg_VM - * Method suspend - * Signature ()V - */ JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_suspend(JNIEnv *env, jobject jvm); - -/** - * Class org_simgrid_msg_VM - * Method resume - * Signature ()V - */ JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_resume(JNIEnv *env, jobject jvm); - -/** - * Class org_simgrid_msg_VM - * Method shutdown - * Signature ()V - */ JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_shutdown(JNIEnv *env, jobject jvm); SG_END_DECL() + #endif diff --git a/src/bindings/java/jxbt_utilities.h b/src/bindings/java/jxbt_utilities.h index 4bb2b09ba3..f69f0078a5 100644 --- a/src/bindings/java/jxbt_utilities.h +++ b/src/bindings/java/jxbt_utilities.h @@ -74,5 +74,4 @@ void jxbt_throw_task_cancelled(JNIEnv * env, char *details); void jxbt_throw_storage_not_found(JNIEnv * env, const char *invalid_name); SG_END_DECL() -#endif /* ! JXBT_UTILITY_H */ - +#endif diff --git a/src/bindings/lua/lua_private.h b/src/bindings/lua/lua_private.h index dfeccf11e1..0010302204 100644 --- a/src/bindings/lua/lua_private.h +++ b/src/bindings/lua/lua_private.h @@ -1,5 +1,4 @@ -/* Copyright (c) 2010, 2012-2015. The SimGrid Team. - * All rights reserved. */ +/* 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. */ @@ -30,5 +29,4 @@ const char* sglua_get_msg_error(msg_error_t err); #define _lua_ensure_ARGN(cond, ...) \ do { if (!(cond)) { luaL_error(L, __VA_ARGS__); return -1;} } while (0) - -#endif /* LUA_PRIVATE_H */ +#endif diff --git a/src/bindings/lua/lua_utils.h b/src/bindings/lua/lua_utils.h index 2eea739097..203c0e4d3d 100644 --- a/src/bindings/lua/lua_utils.h +++ b/src/bindings/lua/lua_utils.h @@ -1,5 +1,4 @@ -/* Copyright (c) 2010-2011, 2013-2014. 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. */ @@ -34,4 +33,4 @@ int sglua_memory_writer(lua_State* L, const void* source, size_t size, void* use } -#endif /* LUA_UTILS_H */ +#endif diff --git a/src/bindings/lua/simgrid_lua.h b/src/bindings/lua/simgrid_lua.h index 289974f6b2..f95d620ab7 100644 --- a/src/bindings/lua/simgrid_lua.h +++ b/src/bindings/lua/simgrid_lua.h @@ -1,5 +1,4 @@ -/* Copyright (c) 2010-2014. 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. */ @@ -29,4 +28,4 @@ int console_AS_seal(lua_State *L); int console_set_function(lua_State*); int console_host_set_property(lua_State*); } -#endif /* SIMGRID_LUA_H */ +#endif diff --git a/src/include/instr/instr_interface.h b/src/include/instr/instr_interface.h index 746a555f37..5414de740f 100644 --- a/src/include/instr/instr_interface.h +++ b/src/include/instr/instr_interface.h @@ -1,9 +1,11 @@ -/* Copyright (c) 2012-2014. 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 SIMGRID_INSTR_INTERFACE_H +#define SIMGRID_INSTR_INTERFACE_H + #include "xbt.h" SG_BEGIN_DECL() @@ -18,3 +20,5 @@ XBT_PUBLIC(void) TRACE_add_start_function(void (*func)(void)); XBT_PUBLIC(void) TRACE_add_end_function(void (*func)(void)); SG_END_DECL() + +#endif \ No newline at end of file diff --git a/src/include/mc/datatypes.h b/src/include/mc/datatypes.h index 54c004d13b..401fca02dc 100644 --- a/src/include/mc/datatypes.h +++ b/src/include/mc/datatypes.h @@ -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. */ @@ -11,7 +10,7 @@ #include #if HAVE_UCONTEXT_H -#include /* context relative declarations */ +#include #endif SG_BEGIN_DECL() @@ -30,4 +29,4 @@ typedef struct s_stack_region* stack_region_t; SG_END_DECL() -#endif /* _MC_MC_H */ +#endif diff --git a/src/include/mc/mc.h b/src/include/mc/mc.h index b306717bf3..8ca9c1a63d 100644 --- a/src/include/mc/mc.h +++ b/src/include/mc/mc.h @@ -82,4 +82,4 @@ XBT_PUBLIC(void) MC_memory_init_server(); SG_END_DECL() -#endif /* MC_MC_H */ +#endif diff --git a/src/include/simgrid/sg_config.h b/src/include/simgrid/sg_config.h index 4bd78c5fdb..588ac419a5 100644 --- a/src/include/simgrid/sg_config.h +++ b/src/include/simgrid/sg_config.h @@ -1,9 +1,11 @@ -/* Copyright (c) 2012-2014. 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 SIMGRID_CONFIG_H +#define SIMGRID_CONFIG_H + #include "xbt/config.h" /** Config Globals */ @@ -17,3 +19,5 @@ XBT_PUBLIC(void) sg_config_init(int *argc, char **argv); XBT_PUBLIC(void) sg_config_finalize(); SG_END_DECL() + +#endif \ No newline at end of file diff --git a/src/include/smpi/smpi_interface.h b/src/include/smpi/smpi_interface.h index f9512d9499..d5669c4918 100644 --- a/src/include/smpi/smpi_interface.h +++ b/src/include/smpi/smpi_interface.h @@ -98,4 +98,4 @@ XBT_PUBLIC(void) smpi_coll_cleanup_mvapich2(void); SG_END_DECL() -#endif /* SMPI_INTERFACE_H */ +#endif diff --git a/src/include/surf/datatypes.h b/src/include/surf/datatypes.h index 3c7dc29bcb..1ce9da6501 100644 --- a/src/include/surf/datatypes.h +++ b/src/include/surf/datatypes.h @@ -1,5 +1,4 @@ -/* Copyright (c) 2009-2014. 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. */ @@ -13,4 +12,4 @@ typedef struct lmm_constraint *lmm_constraint_t; typedef struct lmm_constraint_light *lmm_constraint_light_t; typedef struct lmm_system *lmm_system_t; -#endif /* MAXMIN_DATATYPES_H */ +#endif diff --git a/src/include/surf/maxmin.h b/src/include/surf/maxmin.h index 393d3dda28..6ba38d1ca2 100644 --- a/src/include/surf/maxmin.h +++ b/src/include/surf/maxmin.h @@ -452,4 +452,4 @@ XBT_PUBLIC(double func_vegas_fpi) (lmm_variable_t var, double x); /** @} */ SG_END_DECL() -#endif /* SURF_MAXMIN_H */ +#endif diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h index 24cc024d86..a20b63ea34 100644 --- a/src/include/surf/surf.h +++ b/src/include/surf/surf.h @@ -658,4 +658,5 @@ 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 diff --git a/src/instr/instr_private.h b/src/instr/instr_private.h index dd0e1c30c5..b6c49e6460 100644 --- a/src/instr/instr_private.h +++ b/src/instr/instr_private.h @@ -1,5 +1,4 @@ -/* 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. */ @@ -455,4 +454,4 @@ typedef struct s_instr_extra_data { SG_END_DECL() -#endif /* INSTR_PRIVATE_H_ */ +#endif diff --git a/src/instr/instr_smpi.h b/src/instr/instr_smpi.h index e371fd6b5e..e0040f7bdb 100644 --- a/src/instr/instr_smpi.h +++ b/src/instr/instr_smpi.h @@ -1,3 +1,8 @@ +/* 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. */ + #ifndef INSTR_SMPI_H_ #define INSTR_SMPI_H_ #ifdef __cplusplus diff --git a/src/mc/mc_base.h b/src/mc/mc_base.h index 095b6992fd..5fcffaa33e 100644 --- a/src/mc/mc_base.h +++ b/src/mc/mc_base.h @@ -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. */ @@ -7,15 +6,14 @@ #ifndef SIMGRID_MC_BASE_H #define SIMGRID_MC_BASE_H -#ifdef __cplusplus -#include -#endif #include #include #ifdef __cplusplus +#include + namespace simgrid { namespace mc { diff --git a/src/mc/mc_comm_pattern.h b/src/mc/mc_comm_pattern.h index 5721626757..3390b5671a 100644 --- a/src/mc/mc_comm_pattern.h +++ b/src/mc/mc_comm_pattern.h @@ -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/mc/mc_ignore.h b/src/mc/mc_ignore.h index ba91c35914..b62bfb14c6 100644 --- a/src/mc/mc_ignore.h +++ b/src/mc/mc_ignore.h @@ -1,5 +1,4 @@ -/* Copyright (c) 2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2015-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/mc/mc_mmalloc.h b/src/mc/mc_mmalloc.h deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/src/mc/mc_mmu.h b/src/mc/mc_mmu.h index 1438db4d0f..eb6d33708c 100644 --- a/src/mc/mc_mmu.h +++ b/src/mc/mc_mmu.h @@ -1,5 +1,4 @@ -/* Copyright (c) 2014-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2014-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/mc/mc_private.h b/src/mc/mc_private.h index 4e8285c26c..a49d3e42f8 100644 --- a/src/mc/mc_private.h +++ b/src/mc/mc_private.h @@ -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/mc/mc_record.h b/src/mc/mc_record.h index ec24b70d49..a25777057a 100644 --- a/src/mc/mc_record.h +++ b/src/mc/mc_record.h @@ -1,5 +1,4 @@ -/* Copyright (c) 2014-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2014-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/mc/mc_replay.h b/src/mc/mc_replay.h index ad7a98d3d9..c824d44a6a 100644 --- a/src/mc/mc_replay.h +++ b/src/mc/mc_replay.h @@ -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/mc/mc_request.h b/src/mc/mc_request.h index 476cf9e0fe..953d83e3bc 100644 --- a/src/mc/mc_request.h +++ b/src/mc/mc_request.h @@ -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/mc/mc_safety.h b/src/mc/mc_safety.h index 8e0e164cd0..2aa3902498 100644 --- a/src/mc/mc_safety.h +++ b/src/mc/mc_safety.h @@ -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/mc/mc_smx.h b/src/mc/mc_smx.h index c078cca1ea..609807ca19 100644 --- a/src/mc/mc_smx.h +++ b/src/mc/mc_smx.h @@ -1,5 +1,4 @@ -/* Copyright (c) 2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2015-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/mc/mc_snapshot.h b/src/mc/mc_snapshot.h index e224509304..8fbba24c69 100644 --- a/src/mc/mc_snapshot.h +++ b/src/mc/mc_snapshot.h @@ -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/mc/mc_state.h b/src/mc/mc_state.h index 6955b68a6c..68198c71fc 100644 --- a/src/mc/mc_state.h +++ b/src/mc/mc_state.h @@ -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/mc/mc_unw.h b/src/mc/mc_unw.h index 6d1fe47e90..945fb4f657 100644 --- a/src/mc/mc_unw.h +++ b/src/mc/mc_unw.h @@ -1,5 +1,4 @@ -/* Copyright (c) 2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2015-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/mc/remote/mc_protocol.h b/src/mc/remote/mc_protocol.h index 189abf3041..add0efacb9 100644 --- a/src/mc/remote/mc_protocol.h +++ b/src/mc/remote/mc_protocol.h @@ -1,5 +1,4 @@ -/* Copyright (c) 2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2015-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/msg/msg_private.h b/src/msg/msg_private.h index 69d838bc1b..f4551c0e48 100644 --- a/src/msg/msg_private.h +++ b/src/msg/msg_private.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. */ diff --git a/src/simix/smx_synchro_private.h b/src/simix/smx_synchro_private.h index c7f882b565..8066b4384f 100644 --- a/src/simix/smx_synchro_private.h +++ b/src/simix/smx_synchro_private.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2012-2016. 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. */ diff --git a/src/smpi/colls/coll_tuned_topo.h b/src/smpi/colls/coll_tuned_topo.h index 24006e41e2..cb669542db 100644 --- a/src/smpi/colls/coll_tuned_topo.h +++ b/src/smpi/colls/coll_tuned_topo.h @@ -1,5 +1,4 @@ -/* Copyright (c) 2013-2014. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2013-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/smpi/colls/colls.h b/src/smpi/colls/colls.h index be58707f4f..816a0659d1 100644 --- a/src/smpi/colls/colls.h +++ b/src/smpi/colls/colls.h @@ -1,5 +1,4 @@ -/* Copyright (c) 2013-2014. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2013-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/smpi/colls/colls_private.h b/src/smpi/colls/colls_private.h index cedb4bb613..0d4c999465 100644 --- a/src/smpi/colls/colls_private.h +++ b/src/smpi/colls/colls_private.h @@ -1,5 +1,4 @@ -/* Copyright (c) 2013-2014. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2013-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/smpi/colls/smpi_mvapich2_selector_stampede.h b/src/smpi/colls/smpi_mvapich2_selector_stampede.h index 7245090080..e0f2156377 100644 --- a/src/smpi/colls/smpi_mvapich2_selector_stampede.h +++ b/src/smpi/colls/smpi_mvapich2_selector_stampede.h @@ -1,11 +1,10 @@ /* selector for collective algorithms based on mvapich decision logic, with calibration from Stampede cluster at TACC*/ - -/* Copyright (c) 2009-2010, 2013-2014. The SimGrid Team. - * All rights reserved. */ - /* This is the tuning used by MVAPICH for Stampede platform based on (MV2_ARCH_INTEL_XEON_E5_2680_16, MV2_HCA_MLX_CX_FDR) */ +/* 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. */ /************ Alltoall variables and initializers */ diff --git a/src/smpi/private.h b/src/smpi/private.h index bbf58b7c27..3d0bdb9784 100644 --- a/src/smpi/private.h +++ b/src/smpi/private.h @@ -1,5 +1,4 @@ -/* Copyright (c) 2007, 2009-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/smpi/smpi_mpi_dt_private.h b/src/smpi/smpi_mpi_dt_private.h index 0ac7ca5a5d..fe0dd8f3b0 100644 --- a/src/smpi/smpi_mpi_dt_private.h +++ b/src/smpi/smpi_mpi_dt_private.h @@ -1,7 +1,6 @@ /* smpi_mpi_dt_private.h -- functions of smpi_mpi_dt.c that are exported to other SMPI modules. */ -/* Copyright (c) 2009-2010, 2012-2014. 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/surf/ns3/ns3_simulator.h b/src/surf/ns3/ns3_simulator.h index a72264e125..c69c1a8d41 100644 --- a/src/surf/ns3/ns3_simulator.h +++ b/src/surf/ns3/ns3_simulator.h @@ -1,4 +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/surf/surf_private.h b/src/surf/surf_private.h index c7f25d9011..abf66e4f55 100644 --- a/src/surf/surf_private.h +++ b/src/surf/surf_private.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 diff --git a/src/xbt/dict_private.h b/src/xbt/dict_private.h index dd21a45996..9b5087ff75 100644 --- a/src/xbt/dict_private.h +++ b/src/xbt/dict_private.h @@ -55,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 diff --git a/src/xbt/graph_private.h b/src/xbt/graph_private.h index 1f2887e396..53bd160be5 100644 --- a/src/xbt/graph_private.h +++ b/src/xbt/graph_private.h @@ -12,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 diff --git a/src/xbt/heap_private.h b/src/xbt/heap_private.h index aa47023592..5c0d12a7b4 100644 --- a/src/xbt/heap_private.h +++ b/src/xbt/heap_private.h @@ -32,4 +32,4 @@ typedef struct xbt_heap { #define MIN_KEY_VALUE -DBL_MAX -#endif /* XBT_HEAP_PRIVATE_H */ +#endif diff --git a/src/xbt/log_private.h b/src/xbt/log_private.h index f0baf8cf5b..7946e17ced 100644 --- a/src/xbt/log_private.h +++ b/src/xbt/log_private.h @@ -1,5 +1,4 @@ -/* Copyright (c) 2007-2011, 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. */ @@ -29,5 +28,4 @@ struct xbt_log_layout_s { */ XBT_PUBLIC(void) xbt_log_parent_set(xbt_log_category_t cat, xbt_log_category_t parent); - -#endif /* LOG_PRIVATE_H */ +#endif diff --git a/src/xbt/mallocator_private.h b/src/xbt/mallocator_private.h index ec34658171..a69e26ddb6 100644 --- a/src/xbt/mallocator_private.h +++ b/src/xbt/mallocator_private.h @@ -20,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 diff --git a/src/xbt/mmalloc/mmprivate.h b/src/xbt/mmalloc/mmprivate.h index d717e3a086..ce97df49df 100644 --- a/src/xbt/mmalloc/mmprivate.h +++ b/src/xbt/mmalloc/mmprivate.h @@ -321,4 +321,4 @@ XBT_PRIVATE size_t mmalloc_get_bytes_used_remote(size_t heaplimit, const malloc_ SG_END_DECL() -#endif /* XBT_MMPRIVATE_H */ +#endif diff --git a/src/xbt_modinter.h b/src/xbt_modinter.h index 67e538c86e..e0240df869 100644 --- a/src/xbt_modinter.h +++ b/src/xbt_modinter.h @@ -1,7 +1,6 @@ /* xbt_modinter - How to init/exit the XBT modules */ -/* Copyright (c) 2004-2010, 2012-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. */ @@ -31,4 +30,5 @@ extern int smx_cleaned; extern int xbt_initialized; SG_END_DECL() -#endif /* XBT_MODINTER_H */ + +#endif diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index 9ec0dbb819..1b32575e59 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -607,7 +607,6 @@ set(MC_SRC src/mc/mc_hash.hpp src/mc/mc_hash.cpp src/mc/mc_ignore.h - src/mc/mc_mmalloc.h src/mc/LocationList.hpp src/mc/LocationList.cpp src/mc/mc_record.cpp