mv mutex.hpp Mutex.hpp (plus make it compile again)

diff --git a/include/simgrid/s4u.hpp b/include/simgrid/s4u.hpp
index 89a40e8..4ffe876 100644 (file)
--- a/include/simgrid/s4u.hpp
+++ b/include/simgrid/s4u.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004-2015. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2004-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. */
 
 /* 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 +11,7 @@
 #include "s4u/engine.hpp"
 #include "s4u/host.hpp"
 
 #include "s4u/engine.hpp"
 #include "s4u/host.hpp"
 

-#include "s4u/mutex.hpp"
+#include "s4u/Mutex.hpp"

 #include "s4u/conditionVariable.hpp"
 #include "s4u/Activity.hpp"
 #include "s4u/comm.hpp"
 #include "s4u/conditionVariable.hpp"
 #include "s4u/Activity.hpp"
 #include "s4u/comm.hpp"

diff --git a/include/simgrid/s4u/mutex.hpp b/include/simgrid/s4u/Mutex.hpp
similarity index 96%
rename from include/simgrid/s4u/mutex.hpp
rename to include/simgrid/s4u/Mutex.hpp
index a863b7d..241ae36 100644 (file)
--- a/include/simgrid/s4u/mutex.hpp
+++ b/include/simgrid/s4u/Mutex.hpp
@@ -41,7 +41,7 @@ public:
 
   // No copy:
   Mutex(Mutex const&) = delete;
 
   // No copy:
   Mutex(Mutex const&) = delete;

-  Mutex& operator(Mutex const&) = delete;
+  Mutex& operator=(Mutex const&) = delete;

 
   static Ptr createMutex();
 
 
   static Ptr createMutex();
 

diff --git a/include/simgrid/s4u/conditionVariable.hpp b/include/simgrid/s4u/conditionVariable.hpp
index 3b03bca..a32c0b3 100644 (file)
--- a/include/simgrid/s4u/conditionVariable.hpp
+++ b/include/simgrid/s4u/conditionVariable.hpp
@@ -18,7 +18,7 @@
 
 #include <simgrid/simix.h>
 #include <simgrid/chrono.hpp>
 
 #include <simgrid/simix.h>
 #include <simgrid/chrono.hpp>

-#include <simgrid/s4u/mutex.hpp>
+#include <simgrid/s4u/Mutex.hpp>

 
 namespace simgrid {
 namespace s4u {
 
 namespace simgrid {
 namespace s4u {

diff --git a/src/s4u/s4u_mutex.cpp b/src/s4u/s4u_mutex.cpp
index 3b1d9f1..ba83148 100644 (file)
--- a/src/s4u/s4u_mutex.cpp
+++ b/src/s4u/s4u_mutex.cpp
@@ -8,7 +8,7 @@
 #include "src/msg/msg_private.h"
 #include "src/simix/smx_synchro_private.h"
 
 #include "src/msg/msg_private.h"
 #include "src/simix/smx_synchro_private.h"
 

-#include "simgrid/s4u/mutex.hpp"
+#include "simgrid/s4u/Mutex.hpp"

 
 namespace simgrid {
 namespace s4u {
 
 namespace simgrid {
 namespace s4u {

diff --git a/src/simix/smx_synchro_private.h b/src/simix/smx_synchro_private.h
index f312483..25c898b 100644 (file)
--- a/src/simix/smx_synchro_private.h
+++ b/src/simix/smx_synchro_private.h
@@ -1,5 +1,4 @@
-/* Copyright (c) 2012, 2014. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2012-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. */
 
 /* 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. */


@@ -9,7 +8,7 @@
 
 #include <atomic>
 
 
 #include <atomic>
 

-#include <simgrid/s4u/mutex.hpp>
+#include <simgrid/s4u/Mutex.hpp>

 #include <simgrid/s4u/conditionVariable.hpp>
 
 #include "xbt/base.h"
 #include <simgrid/s4u/conditionVariable.hpp>
 
 #include "xbt/base.h"

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index e5f1a61..f798306 100644 (file)
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -651,7 +651,7 @@ set(headers_to_install
   include/simgrid/s4u/file.hpp  
   include/simgrid/s4u/host.hpp  
   include/simgrid/s4u/mailbox.hpp  
   include/simgrid/s4u/file.hpp  
   include/simgrid/s4u/host.hpp  
   include/simgrid/s4u/mailbox.hpp  

-  include/simgrid/s4u/mutex.hpp
+  include/simgrid/s4u/Mutex.hpp

   include/simgrid/s4u/conditionVariable.hpp
   include/simgrid/s4u/storage.hpp  
   include/simgrid/s4u.hpp
   include/simgrid/s4u/conditionVariable.hpp
   include/simgrid/s4u/storage.hpp  
   include/simgrid/s4u.hpp