You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by bm...@apache.org on 2016/03/12 03:55:30 UTC
[2/7] mesos git commit: Marked the Duration class constants as
`constexpr`.
Marked the Duration class constants as `constexpr`.
Review: https://reviews.apache.org/r/44717/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/6ce23f80
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/6ce23f80
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/6ce23f80
Branch: refs/heads/master
Commit: 6ce23f80b9c1e3757d3b727bac1f17c70dd62a9d
Parents: b27366f
Author: Neil Conway <ne...@gmail.com>
Authored: Fri Mar 11 18:09:41 2016 -0800
Committer: Benjamin Mahler <bm...@apache.org>
Committed: Fri Mar 11 18:09:41 2016 -0800
----------------------------------------------------------------------
.../3rdparty/stout/include/stout/duration.hpp | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/6ce23f80/3rdparty/libprocess/3rdparty/stout/include/stout/duration.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/duration.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/duration.hpp
index ecec706..aea2808 100644
--- a/3rdparty/libprocess/3rdparty/stout/include/stout/duration.hpp
+++ b/3rdparty/libprocess/3rdparty/stout/include/stout/duration.hpp
@@ -167,14 +167,14 @@ public:
static constexpr Duration zero() { return Duration(); }
protected:
- static const int64_t NANOSECONDS = 1;
- static const int64_t MICROSECONDS = 1000 * NANOSECONDS;
- static const int64_t MILLISECONDS = 1000 * MICROSECONDS;
- static const int64_t SECONDS = 1000 * MILLISECONDS;
- static const int64_t MINUTES = 60 * SECONDS;
- static const int64_t HOURS = 60 * MINUTES;
- static const int64_t DAYS = 24 * HOURS;
- static const int64_t WEEKS = 7 * DAYS;
+ static constexpr int64_t NANOSECONDS = 1;
+ static constexpr int64_t MICROSECONDS = 1000 * NANOSECONDS;
+ static constexpr int64_t MILLISECONDS = 1000 * MICROSECONDS;
+ static constexpr int64_t SECONDS = 1000 * MILLISECONDS;
+ static constexpr int64_t MINUTES = 60 * SECONDS;
+ static constexpr int64_t HOURS = 60 * MINUTES;
+ static constexpr int64_t DAYS = 24 * HOURS;
+ static constexpr int64_t WEEKS = 7 * DAYS;
// Construct from a (value, unit) pair.
constexpr Duration(int64_t value, int64_t unit)