fix case of a header file

diff --git a/include/simgrid/s4u.hpp b/include/simgrid/s4u.hpp
index 89f79d1..0da7c98 100644 (file)
--- a/include/simgrid/s4u.hpp
+++ b/include/simgrid/s4u.hpp
@@ -1,4 +1,4 @@
-/* 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. */
@@ -12,8 +12,8 @@
 #include <simgrid/s4u/engine.hpp>
 #include <simgrid/s4u/host.hpp>
 
+#include <simgrid/s4u/ConditionVariable.hpp>
 #include <simgrid/s4u/Mutex.hpp>
-#include <simgrid/s4u/conditionVariable.hpp>
 #include <simgrid/s4u/comm.hpp>
 
 #include <simgrid/s4u/storage.hpp>

diff --git a/include/simgrid/s4u/conditionVariable.hpp b/include/simgrid/s4u/ConditionVariable.hpp
similarity index 66%
rename from include/simgrid/s4u/conditionVariable.hpp
rename to include/simgrid/s4u/ConditionVariable.hpp
index 47451e6..2ccf89d 100644 (file)
--- a/include/simgrid/s4u/conditionVariable.hpp
+++ b/include/simgrid/s4u/ConditionVariable.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006-2016. 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. */
@@ -16,9 +16,9 @@
 
 #include <xbt/base.h>
 
-#include <simgrid/simix.h>
 #include <simgrid/chrono.hpp>
 #include <simgrid/s4u/Mutex.hpp>
+#include <simgrid/simix.h>
 
 namespace simgrid {
 namespace s4u {
@@ -30,18 +30,18 @@ namespace s4u {
  *  semantic. But we currently use (only) double for both durations and
  *  timestamp timeouts.
  */
-XBT_PUBLIC_CLASS ConditionVariable {
+XBT_PUBLIC_CLASS ConditionVariable
+{
 private:
   friend s_smx_cond;
   smx_cond_t cond_;
   ConditionVariable(smx_cond_t cond) : cond_(cond) {}
 public:
-
   ConditionVariable(ConditionVariable const&) = delete;
   ConditionVariable& operator=(ConditionVariable const&) = delete;
 
-  friend XBT_PUBLIC(void) intrusive_ptr_add_ref(ConditionVariable* cond);
-  friend XBT_PUBLIC(void) intrusive_ptr_release(ConditionVariable* cond);
+  friend XBT_PUBLIC(void) intrusive_ptr_add_ref(ConditionVariable * cond);
+  friend XBT_PUBLIC(void) intrusive_ptr_release(ConditionVariable * cond);
   using Ptr = boost::intrusive_ptr<ConditionVariable>;
 
   static Ptr createConditionVariable();
@@ -49,9 +49,8 @@ public:
   //  Wait functions without time:
 
   void wait(MutexPtr lock);
-  void wait(std::unique_lock<Mutex>& lock);
-  template<class P>
-  void wait(std::unique_lock<Mutex>& lock, P pred)
+  void wait(std::unique_lock<Mutex> & lock);
+  template <class P> void wait(std::unique_lock<Mutex> & lock, P pred)
   {
     while (!pred())
       wait(lock);
@@ -59,53 +58,45 @@ public:
 
   // Wait function taking a plain double as time:
 
-  std::cv_status wait_until(std::unique_lock<Mutex>& lock, double timeout_time);
-  std::cv_status wait_for(std::unique_lock<Mutex>& lock, double duration);
-  template<class P>
-  bool wait_until(std::unique_lock<Mutex>& lock, double timeout_time, P pred)
+  std::cv_status wait_until(std::unique_lock<Mutex> & lock, double timeout_time);
+  std::cv_status wait_for(std::unique_lock<Mutex> & lock, double duration);
+  template <class P> bool wait_until(std::unique_lock<Mutex> & lock, double timeout_time, P pred)
   {
     while (!pred())
       if (this->wait_until(lock, timeout_time) == std::cv_status::timeout)
         return pred();
     return true;
   }
-  template<class P>
-  bool wait_for(std::unique_lock<Mutex>& lock, double duration, P pred)
+  template <class P> bool wait_for(std::unique_lock<Mutex> & lock, double duration, P pred)
   {
     return this->wait_until(lock, SIMIX_get_clock() + duration, std::move(pred));
   }
 
   // Wait function taking a C++ style time:
 
-  template<class Rep, class Period, class P>
-  bool wait_for(
-    std::unique_lock<Mutex>& lock, std::chrono::duration<Rep, Period> duration,
-    P pred)
+  template <class Rep, class Period, class P>
+  bool wait_for(std::unique_lock<Mutex> & lock, std::chrono::duration<Rep, Period> duration, P pred)
   {
     auto seconds = std::chrono::duration_cast<SimulationClockDuration>(duration);
     return this->wait_for(lock, seconds.count(), pred);
   }
-  template<class Rep, class Period>
-  std::cv_status wait_for(
-    std::unique_lock<Mutex>& lock, std::chrono::duration<Rep, Period> duration)
+  template <class Rep, class Period>
+  std::cv_status wait_for(std::unique_lock<Mutex> & lock, std::chrono::duration<Rep, Period> duration)
   {
     auto seconds = std::chrono::duration_cast<SimulationClockDuration>(duration);
     return this->wait_for(lock, seconds.count());
   }
-  template<class Duration>
-  std::cv_status wait_until(std::unique_lock<Mutex>& lock,
-    const SimulationTimePoint<Duration>& timeout_time)
+  template <class Duration>
+  std::cv_status wait_until(std::unique_lock<Mutex> & lock, const SimulationTimePoint<Duration>& timeout_time)
   {
     auto timeout_native = std::chrono::time_point_cast<SimulationClockDuration>(timeout_time);
     return this->wait_until(lock, timeout_native.time_since_epoch().count());
   }
-  template<class Duration, class P>
-  bool wait_until(std::unique_lock<Mutex>& lock,
-    const SimulationTimePoint<Duration>& timeout_time, P pred)
+  template <class Duration, class P>
+  bool wait_until(std::unique_lock<Mutex> & lock, const SimulationTimePoint<Duration>& timeout_time, P pred)
   {
     auto timeout_native = std::chrono::time_point_cast<SimulationClockDuration>(timeout_time);
-    return this->wait_until(lock, timeout_native.time_since_epoch().count(),
-      std::move(pred));
+    return this->wait_until(lock, timeout_native.time_since_epoch().count(), std::move(pred));
   }
 
   // Notify functions
@@ -118,7 +109,7 @@ public:
 };
 
 using ConditionVariablePtr = ConditionVariable::Ptr;
+}
+} // namespace simgrid::s4u
 
-}} // namespace simgrid::s4u
-
-#endif /* SIMGRID_S4U_COND_VARIABLE_HPP */
+#endif

diff --git a/src/s4u/s4u_conditionVariable.cpp b/src/s4u/s4u_conditionVariable.cpp
index be528ba..98b4e6b 100644 (file)
--- a/src/s4u/s4u_conditionVariable.cpp
+++ b/src/s4u/s4u_conditionVariable.cpp
@@ -1,12 +1,17 @@
+/* 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. */
+
 #include <exception>
 #include <mutex>
 
 #include <xbt/ex.hpp>
 #include <xbt/log.hpp>
 
-#include "src/simix/smx_synchro_private.h"
-#include "simgrid/s4u/conditionVariable.hpp"
+#include "simgrid/s4u/ConditionVariable.hpp"
 #include "simgrid/simix.h"
+#include "src/simix/smx_synchro_private.h"
 
 namespace simgrid {
 namespace s4u {

diff --git a/src/simix/smx_synchro_private.h b/src/simix/smx_synchro_private.h
index 8066b43..c4c5371 100644 (file)
--- a/src/simix/smx_synchro_private.h
+++ b/src/simix/smx_synchro_private.h
@@ -6,7 +6,7 @@
 #ifndef SIMIX_SYNCHRO_PRIVATE_H
 #define SIMIX_SYNCHRO_PRIVATE_H
 
-#include "simgrid/s4u/conditionVariable.hpp"
+#include "simgrid/s4u/ConditionVariable.hpp"
 #include "xbt/swag.h"
 
 namespace simgrid {

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index 5aa4170..eeb58b7 100644 (file)
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -670,7 +670,7 @@ set(headers_to_install
   include/simgrid/s4u/Activity.hpp
   include/simgrid/s4u/Actor.hpp
   include/simgrid/s4u/comm.hpp
-  include/simgrid/s4u/conditionVariable.hpp
+  include/simgrid/s4u/ConditionVariable.hpp
   include/simgrid/s4u/engine.hpp  
   include/simgrid/s4u/file.hpp  
   include/simgrid/s4u/host.hpp