partial revert of e16e0233

[simgrid.git] / include / xbt / range.hpp

diff --git a/include/xbt/range.hpp b/include/xbt/range.hpp
index 7e13722..872efe1 100644 (file)
--- a/include/xbt/range.hpp
+++ b/include/xbt/range.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2016. The SimGrid Team.
+/* Copyright (c) 2016-2019. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -7,17 +7,19 @@
 #ifndef SIMGRID_XBT_RANGE_HPP
 #define SIMGRID_XBT_RANGE_HPP
 
+#include <algorithm>
+
 namespace simgrid {
 namespace xbt {
 
 /** Describes a contiguous inclusive-exclusive [a,b) range of values */
-template<class T> class range {
+template<class T> class Range {
   T begin_;
   T end_;
 public:
-  range()               : begin_(), end_() {}
-  range(T begin, T end) : begin_(std::move(begin)), end_(std::move(end)) {}
-  range(T value) : begin_(value), end_(value + 1) {}
+  Range()               : begin_(), end_() {}
+  Range(T begin, T end) : begin_(std::move(begin)), end_(std::move(end)) {}
+  explicit Range(T value) : begin_(value), end_(value + 1) {}
   T& begin()             { return begin_; }
   T& end()               { return end_; }
   const T& begin() const { return begin_; }