You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by mp...@apache.org on 2017/03/16 21:11:14 UTC
[3/3] mesos git commit: Replaced Boost Type Traits with STL in stout.
Replaced Boost Type Traits with STL in stout.
Review: https://reviews.apache.org/r/57689/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/09623fc4
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/09623fc4
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/09623fc4
Branch: refs/heads/master
Commit: 09623fc4c5707b90f138d9f6c73b0368b58f60ce
Parents: 09efd57
Author: Ilya Pronin <ip...@twopensource.com>
Authored: Thu Mar 16 13:00:22 2017 -0700
Committer: Michael Park <mp...@apache.org>
Committed: Thu Mar 16 14:00:51 2017 -0700
----------------------------------------------------------------------
3rdparty/stout/include/stout/json.hpp | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/09623fc4/3rdparty/stout/include/stout/json.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/stout/include/stout/json.hpp b/3rdparty/stout/include/stout/json.hpp
index be73340..aa581c0 100644
--- a/3rdparty/stout/include/stout/json.hpp
+++ b/3rdparty/stout/include/stout/json.hpp
@@ -30,8 +30,6 @@
#include <type_traits>
#include <vector>
-#include <boost/type_traits/is_arithmetic.hpp>
-#include <boost/utility/enable_if.hpp>
#include <boost/variant.hpp>
#include <stout/check.hpp>
@@ -257,7 +255,7 @@ struct Value : internal::Variant
template <typename T>
Value(
const T& value,
- typename boost::enable_if<boost::is_arithmetic<T>, int>::type = 0)
+ typename std::enable_if<std::is_arithmetic<T>::value, int>::type = 0)
: internal::Variant(Number(value)) {}
// Non-arithmetic types are passed to the default constructor of
@@ -265,7 +263,7 @@ struct Value : internal::Variant
template <typename T>
Value(
const T& value,
- typename boost::disable_if<boost::is_arithmetic<T>, int>::type = 0)
+ typename std::enable_if<!std::is_arithmetic<T>::value, int>::type = 0)
: internal::Variant(value) {}
template <typename T>