From 2ca35a707044d033c33cb4f016e6ffddfded0d05 Mon Sep 17 00:00:00 2001
From: Martin Quinson <martin.quinson@loria.fr>
Date: Fri, 29 Jul 2016 07:44:20 +0200
Subject: [PATCH] mv mutex.hpp Mutex.hpp (plus make it compile again)

---
 include/simgrid/s4u.hpp                      | 4 ++--
 include/simgrid/s4u/{mutex.hpp => Mutex.hpp} | 2 +-
 include/simgrid/s4u/conditionVariable.hpp    | 2 +-
 src/s4u/s4u_mutex.cpp                        | 2 +-
 src/simix/smx_synchro_private.h              | 5 ++---
 tools/cmake/DefinePackages.cmake             | 2 +-
 6 files changed, 8 insertions(+), 9 deletions(-)
 rename include/simgrid/s4u/{mutex.hpp => Mutex.hpp} (96%)

diff --git a/include/simgrid/s4u.hpp b/include/simgrid/s4u.hpp
index 89a40e850f..4ffe876512 100644
--- 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. */
@@ -11,7 +11,7 @@
 #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"
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 a863b7dd0a..241ae36f91 100644
--- a/include/simgrid/s4u/mutex.hpp
+++ b/include/simgrid/s4u/Mutex.hpp
@@ -41,7 +41,7 @@ public:
 
   // No copy:
   Mutex(Mutex const&) = delete;
-  Mutex& operator(Mutex const&) = delete;
+  Mutex& operator=(Mutex const&) = delete;
 
   static Ptr createMutex();
 
diff --git a/include/simgrid/s4u/conditionVariable.hpp b/include/simgrid/s4u/conditionVariable.hpp
index 3b03bca7ff..a32c0b3480 100644
--- 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/s4u/mutex.hpp>
+#include <simgrid/s4u/Mutex.hpp>
 
 namespace simgrid {
 namespace s4u {
diff --git a/src/s4u/s4u_mutex.cpp b/src/s4u/s4u_mutex.cpp
index 3b1d9f156b..ba83148c58 100644
--- 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 "simgrid/s4u/mutex.hpp"
+#include "simgrid/s4u/Mutex.hpp"
 
 namespace simgrid {
 namespace s4u {
diff --git a/src/simix/smx_synchro_private.h b/src/simix/smx_synchro_private.h
index f312483329..25c898bbe1 100644
--- 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. */
@@ -9,7 +8,7 @@
 
 #include <atomic>
 
-#include <simgrid/s4u/mutex.hpp>
+#include <simgrid/s4u/Mutex.hpp>
 #include <simgrid/s4u/conditionVariable.hpp>
 
 #include "xbt/base.h"
diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index e5f1a61669..f798306a69 100644
--- 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/mutex.hpp
+  include/simgrid/s4u/Mutex.hpp
   include/simgrid/s4u/conditionVariable.hpp
   include/simgrid/s4u/storage.hpp  
   include/simgrid/s4u.hpp
-- 
2.20.1