From 0d0434e686edbbe357c89739d44a7465ba4cf55b Mon Sep 17 00:00:00 2001
From: Cinder <cinder@sdf.org>
Date: Tue, 5 Jan 2016 05:02:59 -0700
Subject: [PATCH] Replace a few more instances of boost::enable_if
---
indra/llcommon/llhandle.h | 5 ++---
indra/llcommon/llinitparam.h | 4 ++--
indra/llcommon/llptrto.h | 7 +++----
indra/llcommon/llsys.cpp | 5 ++---
4 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/indra/llcommon/llhandle.h b/indra/llcommon/llhandle.h
index 3072d2edbf..b11c39acb1 100755
--- a/indra/llcommon/llhandle.h
+++ b/indra/llcommon/llhandle.h
@@ -28,7 +28,6 @@
#define LLHANDLE_H
#include "llpointer.h"
-#include <boost/utility/enable_if.hpp>
/**
* Helper object for LLHandle. Don't instantiate these directly, used
@@ -85,7 +84,7 @@ public:
LLHandle() : mTombStone(getDefaultTombStone()) {}
template<typename U>
- LLHandle(const LLHandle<U>& other, typename boost::enable_if< typename std::is_convertible<U*, T*> >::type* dummy = 0)
+ LLHandle(const LLHandle<U>& other, typename std::enable_if<std::is_convertible<U*, T*>::value>::type* dummy = nullptr)
: mTombStone(other.mTombStone)
{}
@@ -194,7 +193,7 @@ public:
}
template <typename U>
- LLHandle<U> getDerivedHandle(typename boost::enable_if< typename std::is_convertible<U*, T*> >::type* dummy = 0) const
+ LLHandle<U> getDerivedHandle(typename std::enable_if<std::is_convertible<U*, T*>::value>::type* dummy = nullptr) const
{
LLHandle<U> downcast_handle;
downcast_handle.mTombStone = getHandle().mTombStone;
diff --git a/indra/llcommon/llinitparam.h b/indra/llcommon/llinitparam.h
index 23e95bc051..81d610f877 100755
--- a/indra/llcommon/llinitparam.h
+++ b/indra/llcommon/llinitparam.h
@@ -493,7 +493,7 @@ namespace LLInitParam
virtual ~Parser();
- template <typename T> bool readValue(T& param, typename boost::disable_if<std::is_enum<T> >::type* dummy = 0)
+ template <typename T> bool readValue(T& param, typename std::enable_if<!std::is_enum<T>::value>::type* dummy = 0)
{
parser_read_func_map_t::iterator found_it = mParserReadFuncs->find(&typeid(T));
if (found_it != mParserReadFuncs->end())
@@ -504,7 +504,7 @@ namespace LLInitParam
return false;
}
- template <typename T> bool readValue(T& param, typename boost::enable_if<std::is_enum<T> >::type* dummy = 0)
+ template <typename T> bool readValue(T& param, typename std::enable_if<std::is_enum<T>::value>::type* dummy = nullptr)
{
parser_read_func_map_t::iterator found_it = mParserReadFuncs->find(&typeid(T));
if (found_it != mParserReadFuncs->end())
diff --git a/indra/llcommon/llptrto.h b/indra/llcommon/llptrto.h
index 507e6845ec..77517cc75f 100755
--- a/indra/llcommon/llptrto.h
+++ b/indra/llcommon/llptrto.h
@@ -34,7 +34,6 @@
#include <type_traits>
#include "llpointer.h"
#include "llrefcount.h" // LLRefCount
-#include <boost/utility/enable_if.hpp>
/**
* LLPtrTo<TARGET>::type is either of two things:
@@ -46,7 +45,7 @@
* This way, a class template can use LLPtrTo<TARGET>::type to select an
* appropriate pointer type to store.
*/
-template <class T, class ENABLE=void>
+template <class T, class ENABLE = void>
struct LLPtrTo
{
typedef T* type;
@@ -54,14 +53,14 @@ struct LLPtrTo
/// specialize for subclasses of LLRefCount
template <class T>
-struct LLPtrTo<T, typename boost::enable_if< std::is_base_of<LLRefCount, T> >::type>
+struct LLPtrTo<T, typename std::enable_if< std::is_base_of<LLRefCount, T>::value>::type>
{
typedef LLPointer<T> type;
};
/// specialize for subclasses of LLThreadSafeRefCount
template <class T>
-struct LLPtrTo<T, typename boost::enable_if< std::is_base_of<LLThreadSafeRefCount, T> >::type>
+struct LLPtrTo<T, typename std::enable_if< std::is_base_of<LLThreadSafeRefCount, T>::value>::type>
{
typedef LLPointer<T> type;
};
diff --git a/indra/llcommon/llsys.cpp b/indra/llcommon/llsys.cpp
index f443a352d9..26202322c8 100755
--- a/indra/llcommon/llsys.cpp
+++ b/indra/llcommon/llsys.cpp
@@ -49,7 +49,6 @@
#include <boost/circular_buffer.hpp>
#include <boost/regex.hpp>
#include <boost/lexical_cast.hpp>
-#include <boost/utility/enable_if.hpp>
using namespace llsd;
@@ -631,7 +630,7 @@ public:
// Store every integer type as LLSD::Integer.
template <class T>
void add(const LLSD::String& name, const T& value,
- typename boost::enable_if<std::is_integral<T> >::type* = 0)
+ typename std::enable_if<std::is_integral<T>::value>::type* = nullptr)
{
mStats[name] = LLSD::Integer(value);
}
@@ -639,7 +638,7 @@ public:
// Store every floating-point type as LLSD::Real.
template <class T>
void add(const LLSD::String& name, const T& value,
- typename boost::enable_if<std::is_floating_point<T> >::type* = 0)
+ typename std::enable_if<std::is_floating_point<T>::value>::type* = nullptr)
{
mStats[name] = LLSD::Real(value);
}
--
GitLab