rename two files in examples

Other files have the same name elsewhere, and this confuses coverage tool in sonar

diff --git a/examples/s4u/CMakeLists.txt b/examples/s4u/CMakeLists.txt
index 46c707e..22ef7d3 100644 (file)
--- a/examples/s4u/CMakeLists.txt
+++ b/examples/s4u/CMakeLists.txt
@@ -18,10 +18,10 @@ foreach (example actor-create actor-daemon actor-join actor-kill actor-lifetime
 endforeach()
 
 # CHORD EXAMPLE
 endforeach()
 
 # CHORD EXAMPLE

-add_executable       (s4u-dht-chord dht-chord/s4u-dht-chord.cpp dht-chord/node.cpp)
+add_executable       (s4u-dht-chord dht-chord/s4u-dht-chord.cpp dht-chord/s4u-dht-chord-node.cpp)

 target_link_libraries(s4u-dht-chord simgrid)
 set_target_properties(s4u-dht-chord PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/dht-chord)
 target_link_libraries(s4u-dht-chord simgrid)
 set_target_properties(s4u-dht-chord PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/dht-chord)

-foreach (file s4u-dht-chord node)
+foreach (file s4u-dht-chord s4u-dht-chord-node)

   set(examples_src  ${examples_src}  ${CMAKE_CURRENT_SOURCE_DIR}/dht-chord/${file}.cpp)
 endforeach()
 set(examples_src  ${examples_src}  ${CMAKE_CURRENT_SOURCE_DIR}/dht-chord/s4u-dht-chord.hpp)
   set(examples_src  ${examples_src}  ${CMAKE_CURRENT_SOURCE_DIR}/dht-chord/${file}.cpp)
 endforeach()
 set(examples_src  ${examples_src}  ${CMAKE_CURRENT_SOURCE_DIR}/dht-chord/s4u-dht-chord.hpp)

diff --git a/examples/s4u/dht-chord/node.cpp b/examples/s4u/dht-chord/s4u-dht-chord-node.cpp
similarity index 100%
rename from examples/s4u/dht-chord/node.cpp
rename to examples/s4u/dht-chord/s4u-dht-chord-node.cpp

diff --git a/teshsuite/msg/CMakeLists.txt b/teshsuite/msg/CMakeLists.txt
index bcb3864..be85523 100644 (file)
--- a/teshsuite/msg/CMakeLists.txt
+++ b/teshsuite/msg/CMakeLists.txt
@@ -28,10 +28,10 @@ foreach(x task_destroy_cancel task_listen_from task_progress)
   set(teshsuite_src ${teshsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/${x}/${x}.cpp)
 endforeach()
 
   set(teshsuite_src ${teshsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/${x}/${x}.cpp)
 endforeach()
 

-add_executable       (bittorrent app-bittorrent/bittorrent.c app-bittorrent/messages.c app-bittorrent/peer.c app-bittorrent/tracker.c app-bittorrent/connection.c)
+add_executable       (bittorrent app-bittorrent/bittorrent.c app-bittorrent/messages.c app-bittorrent/bittorrent-peer.c app-bittorrent/tracker.c app-bittorrent/connection.c)

 target_link_libraries(bittorrent simgrid)
 set_target_properties(bittorrent PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/app-bittorrent)
 target_link_libraries(bittorrent simgrid)
 set_target_properties(bittorrent PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/app-bittorrent)

-foreach (file bittorrent connection messages peer tracker)
+foreach (file bittorrent connection messages bittorrent-peer tracker)

   set(teshsuite_src  ${teshsuite_src}  ${CMAKE_CURRENT_SOURCE_DIR}/app-bittorrent/${file}.c  ${CMAKE_CURRENT_SOURCE_DIR}/app-bittorrent/${file}.h)
 endforeach()
 
   set(teshsuite_src  ${teshsuite_src}  ${CMAKE_CURRENT_SOURCE_DIR}/app-bittorrent/${file}.c  ${CMAKE_CURRENT_SOURCE_DIR}/app-bittorrent/${file}.h)
 endforeach()
 

diff --git a/teshsuite/msg/app-bittorrent/peer.c b/teshsuite/msg/app-bittorrent/bittorrent-peer.c
similarity index 99%
rename from teshsuite/msg/app-bittorrent/peer.c
rename to teshsuite/msg/app-bittorrent/bittorrent-peer.c
index 69d75df..eb85a49 100644 (file)
--- a/teshsuite/msg/app-bittorrent/peer.c
+++ b/teshsuite/msg/app-bittorrent/bittorrent-peer.c
@@ -3,7 +3,7 @@
 /* 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 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 "peer.h"
+#include "bittorrent-peer.h"

 #include "connection.h"
 #include "messages.h"
 #include "tracker.h"
 #include "connection.h"
 #include "messages.h"
 #include "tracker.h"

diff --git a/teshsuite/msg/app-bittorrent/peer.h b/teshsuite/msg/app-bittorrent/bittorrent-peer.h
similarity index 100%
rename from teshsuite/msg/app-bittorrent/peer.h
rename to teshsuite/msg/app-bittorrent/bittorrent-peer.h

diff --git a/teshsuite/msg/app-bittorrent/bittorrent.c b/teshsuite/msg/app-bittorrent/bittorrent.c
index 93b8e0e..7cad511 100644 (file)
--- a/teshsuite/msg/app-bittorrent/bittorrent.c
+++ b/teshsuite/msg/app-bittorrent/bittorrent.c
@@ -5,7 +5,7 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "bittorrent.h"
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "bittorrent.h"

-#include "peer.h"
+#include "bittorrent-peer.h"

 #include "tracker.h"
 #include <simgrid/msg.h>
 #include <xbt/RngStream.h>
 #include "tracker.h"
 #include <simgrid/msg.h>
 #include <xbt/RngStream.h>