Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/geom/node.h
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ class Node : public Point,
*/
template <typename T,
typename = typename
boostcopy::enable_if_c<ScalarTraits<T>::value,void>::type>
std::enable_if<ScalarTraits<T>::value,void>::type>
explicit Node (const T x) :
Point (x,0,0)
{ this->set_id() = invalid_id; }
Expand Down
2 changes: 1 addition & 1 deletion include/geom/point.h
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ class Point : public TypeVector<Real>
*/
template <typename T,
typename = typename
boostcopy::enable_if_c<ScalarTraits<T>::value,void>::type>
std::enable_if<ScalarTraits<T>::value,void>::type>
Point (const T x) :
TypeVector<Real> (x,0,0)
{}
Expand Down
4 changes: 2 additions & 2 deletions include/numerics/dense_matrix.h
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ class DenseMatrix : public DenseMatrixBase<T>
* \returns A reference to *this.
*/
template<typename T2, typename T3>
typename boostcopy::enable_if_c<
typename std::enable_if<
ScalarTraits<T2>::value, void >::type add (const T2 factor,
const DenseMatrix<T3> & mat);

Expand Down Expand Up @@ -1013,7 +1013,7 @@ DenseMatrix<T> & DenseMatrix<T>::operator *= (const T factor)
template<typename T>
template<typename T2, typename T3>
inline
typename boostcopy::enable_if_c<
typename std::enable_if<
ScalarTraits<T2>::value, void >::type
DenseMatrix<T>::add (const T2 factor,
const DenseMatrix<T3> & mat)
Expand Down
4 changes: 2 additions & 2 deletions include/numerics/dense_matrix_base.h
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ class DenseMatrixBase
* if T2 is scalar. Return type is void
*/
template <typename T2, typename T3>
typename boostcopy::enable_if_c<
typename std::enable_if<
ScalarTraits<T2>::value, void >::type
add (const T2 factor,
const DenseMatrixBase<T3> & mat);
Expand Down Expand Up @@ -190,7 +190,7 @@ class DenseMatrixBase
template<typename T>
template<typename T2, typename T3>
inline
typename boostcopy::enable_if_c<
typename std::enable_if<
ScalarTraits<T2>::value, void >::type
DenseMatrixBase<T>::add (const T2 factor,
const DenseMatrixBase<T3> & mat)
Expand Down
4 changes: 2 additions & 2 deletions include/numerics/dense_vector.h
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ class DenseVector : public DenseVectorBase<T>
* \returns A reference to *this.
*/
template <typename T2, typename T3>
typename boostcopy::enable_if_c<
typename std::enable_if<
ScalarTraits<T2>::value, void >::type
add (const T2 factor,
const DenseVector<T3> & vec);
Expand Down Expand Up @@ -472,7 +472,7 @@ DenseVector<T> & DenseVector<T>::operator*= (const T factor)
template<typename T>
template<typename T2, typename T3>
inline
typename boostcopy::enable_if_c<
typename std::enable_if<
ScalarTraits<T2>::value, void >::type
DenseVector<T>::add (const T2 factor,
const DenseVector<T3> & vec)
Expand Down
4 changes: 2 additions & 2 deletions include/numerics/tensor_tools.h
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ namespace TensorTools

template <typename T, typename T2>
inline
typename boostcopy::enable_if_c<ScalarTraits<T>::value && ScalarTraits<T2>::value,
typename CompareTypes<T, T2>::supertype>::type
typename std::enable_if<ScalarTraits<T>::value && ScalarTraits<T2>::value,
typename CompareTypes<T, T2>::supertype>::type
inner_product(const T & a, const T2& b)
{ return a * b; }

Expand Down
6 changes: 3 additions & 3 deletions include/numerics/tensor_value.h
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ class TensorValue : public TypeTensor<T>
const Scalar & zx=0,
const Scalar & zy=0,
typename
boostcopy::enable_if_c<ScalarTraits<Scalar>::value,
std::enable_if<ScalarTraits<Scalar>::value,
const Scalar>::type & zz=0);

/**
Expand Down Expand Up @@ -139,7 +139,7 @@ class TensorValue : public TypeTensor<T>
* Assignment-from-scalar operator. Used only to zero out tensors.
*/
template <typename Scalar>
typename boostcopy::enable_if_c<
typename std::enable_if<
ScalarTraits<Scalar>::value,
TensorValue &>::type
operator = (const Scalar & libmesh_dbg_var(p) )
Expand Down Expand Up @@ -247,7 +247,7 @@ TensorValue<T>::TensorValue (const Scalar & xx,
const Scalar & zx,
const Scalar & zy,
typename
boostcopy::enable_if_c<ScalarTraits<Scalar>::value,
std::enable_if<ScalarTraits<Scalar>::value,
const Scalar>::type & zz) :
TypeTensor<T> (xx,xy,xz,yx,yy,yz,zx,zy,zz)
{
Expand Down
10 changes: 5 additions & 5 deletions include/numerics/type_n_tensor.h
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ class TypeNTensor
}

template <typename Scalar>
typename boostcopy::enable_if_c<
typename std::enable_if<
ScalarTraits<Scalar>::value,
TypeNTensor &>::type
operator = (const Scalar & libmesh_dbg_var(p))
Expand Down Expand Up @@ -156,7 +156,7 @@ class TypeNTensor
* Multiply every entry of a tensor by a number.
*/
template <typename Scalar>
typename boostcopy::enable_if_c<
typename std::enable_if<
ScalarTraits<Scalar>::value,
TypeNTensor<N,typename CompareTypes<T, Scalar>::supertype>>::type
operator * (const Scalar) const
Expand All @@ -179,7 +179,7 @@ class TypeNTensor
* Divide every entry of a tensor by a number.
*/
template <typename Scalar>
typename boostcopy::enable_if_c<
typename std::enable_if<
ScalarTraits<Scalar>::value,
TypeNTensor<N,typename CompareTypes<T, Scalar>::supertype>>::type
operator / (const Scalar) const
Expand Down Expand Up @@ -317,7 +317,7 @@ void TypeNTensor<N, T>::add_scaled (const TypeNTensor<N, T2> & p, const T & fact
}

template <unsigned int N, typename T, typename Scalar>
typename boostcopy::enable_if_c<
typename std::enable_if<
ScalarTraits<Scalar>::value,
TypeNTensor<N,typename CompareTypes<Scalar, T>::supertype>>::type
operator * (const Scalar &, const TypeNTensor<N, T> &)
Expand All @@ -327,7 +327,7 @@ operator * (const Scalar &, const TypeNTensor<N, T> &)
}

template <unsigned int N, typename T, typename Scalar>
typename boostcopy::enable_if_c<
typename std::enable_if<
ScalarTraits<Scalar>::value,
TypeNTensor<N,typename CompareTypes<Scalar, T>::supertype>>::type
operator / (const Scalar &, const TypeNTensor<N, T> &)
Expand Down
18 changes: 9 additions & 9 deletions include/numerics/type_tensor.h
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ class TypeTensor
const Scalar & zx=0,
const Scalar & zy=0,
typename
boostcopy::enable_if_c<ScalarTraits<Scalar>::value,
std::enable_if<ScalarTraits<Scalar>::value,
const Scalar>::type & zz=0);

/**
Expand Down Expand Up @@ -147,7 +147,7 @@ class TypeTensor
* \returns A reference to *this.
*/
template <typename Scalar>
typename boostcopy::enable_if_c<
typename std::enable_if<
ScalarTraits<Scalar>::value,
TypeTensor &>::type
operator = (const Scalar & libmesh_dbg_var(p))
Expand Down Expand Up @@ -254,7 +254,7 @@ class TypeTensor
*/
template <typename Scalar>
auto
operator * (const Scalar & scalar) const -> typename boostcopy::enable_if_c<
operator * (const Scalar & scalar) const -> typename std::enable_if<
ScalarTraits<Scalar>::value,
TypeTensor<decltype(T() * scalar)>>::type;

Expand All @@ -263,7 +263,7 @@ class TypeTensor
*
* \returns A reference to *this.
*/
template <typename Scalar, typename boostcopy::enable_if_c<
template <typename Scalar, typename std::enable_if<
ScalarTraits<Scalar>::value, int>::type = 0>
const TypeTensor<T> & operator *= (const Scalar & factor)
{
Expand All @@ -279,7 +279,7 @@ class TypeTensor
* \returns A copy of the result, this tensor is unchanged.
*/
template <typename Scalar>
typename boostcopy::enable_if_c<
typename std::enable_if<
ScalarTraits<Scalar>::value,
TypeTensor<typename CompareTypes<T, Scalar>::supertype>>::type
operator / (const Scalar &) const;
Expand Down Expand Up @@ -592,7 +592,7 @@ TypeTensor<T>::TypeTensor (const Scalar & xx,
const Scalar & zx,
const Scalar & zy,
typename
boostcopy::enable_if_c<ScalarTraits<Scalar>::value,
std::enable_if<ScalarTraits<Scalar>::value,
const Scalar>::type & zz)
{
_coords[0] = xx;
Expand Down Expand Up @@ -969,7 +969,7 @@ template <typename T>
template <typename Scalar>
inline
auto
TypeTensor<T>::operator * (const Scalar & factor) const -> typename boostcopy::enable_if_c<
TypeTensor<T>::operator * (const Scalar & factor) const -> typename std::enable_if<
ScalarTraits<Scalar>::value,
TypeTensor<decltype(T() * factor)>>::type
{
Expand Down Expand Up @@ -1004,7 +1004,7 @@ TypeTensor<T>::operator * (const Scalar & factor) const -> typename boostcopy::e

template <typename T, typename Scalar>
inline
typename boostcopy::enable_if_c<
typename std::enable_if<
ScalarTraits<Scalar>::value,
TypeTensor<typename CompareTypes<T, Scalar>::supertype>>::type
operator * (const Scalar & factor,
Expand All @@ -1016,7 +1016,7 @@ operator * (const Scalar & factor,
template <typename T>
template <typename Scalar>
inline
typename boostcopy::enable_if_c<
typename std::enable_if<
ScalarTraits<Scalar>::value,
TypeTensor<typename CompareTypes<T, Scalar>::supertype>>::type
TypeTensor<T>::operator / (const Scalar & factor) const
Expand Down
28 changes: 14 additions & 14 deletions include/numerics/type_vector.h
Original file line number Diff line number Diff line change
Expand Up @@ -88,13 +88,13 @@ class TypeVector
*/
template <typename Scalar1, typename Scalar2, typename Scalar3>
TypeVector (typename
boostcopy::enable_if_c<ScalarTraits<Scalar1>::value,
std::enable_if<ScalarTraits<Scalar1>::value,
const Scalar1>::type & x,
typename
boostcopy::enable_if_c<ScalarTraits<Scalar2>::value,
std::enable_if<ScalarTraits<Scalar2>::value,
const Scalar2>::type & y=0,
typename
boostcopy::enable_if_c<ScalarTraits<Scalar3>::value,
std::enable_if<ScalarTraits<Scalar3>::value,
const Scalar3>::type & z=0);

/**
Expand All @@ -106,7 +106,7 @@ class TypeVector
template <typename Scalar>
TypeVector (const Scalar & x,
typename
boostcopy::enable_if_c<ScalarTraits<Scalar>::value,
std::enable_if<ScalarTraits<Scalar>::value,
const Scalar>::type * sfinae = nullptr);

public:
Expand Down Expand Up @@ -147,7 +147,7 @@ class TypeVector
* Assignment-from-scalar operator. Used only to zero out vectors.
*/
template <typename Scalar>
typename boostcopy::enable_if_c<
typename std::enable_if<
ScalarTraits<Scalar>::value,
TypeVector &>::type
operator = (const Scalar & libmesh_dbg_var(p))
Expand Down Expand Up @@ -235,7 +235,7 @@ class TypeVector
* \returns A copy of the result, this vector is unchanged.
*/
template <typename Scalar>
typename boostcopy::enable_if_c<
typename std::enable_if<
ScalarTraits<Scalar>::value,
TypeVector<typename CompareTypes<T, Scalar>::supertype>>::type
operator * (const Scalar &) const;
Expand All @@ -253,7 +253,7 @@ class TypeVector
* \returns A copy of the result, this vector is unchanged.
*/
template <typename Scalar>
typename boostcopy::enable_if_c<
typename std::enable_if<
ScalarTraits<Scalar>::value,
TypeVector<typename CompareTypes<T, Scalar>::supertype>>::type
operator / (const Scalar &) const;
Expand Down Expand Up @@ -469,13 +469,13 @@ template <typename T>
template <typename Scalar1, typename Scalar2, typename Scalar3>
inline
TypeVector<T>::TypeVector (typename
boostcopy::enable_if_c<ScalarTraits<Scalar1>::value,
std::enable_if<ScalarTraits<Scalar1>::value,
const Scalar1>::type & x,
typename
boostcopy::enable_if_c<ScalarTraits<Scalar2>::value,
std::enable_if<ScalarTraits<Scalar2>::value,
const Scalar2>::type & y,
typename
boostcopy::enable_if_c<ScalarTraits<Scalar3>::value,
std::enable_if<ScalarTraits<Scalar3>::value,
const Scalar3>::type & z)
{
_coords[0] = x;
Expand All @@ -500,7 +500,7 @@ template <typename Scalar>
inline
TypeVector<T>::TypeVector (const Scalar & x,
typename
boostcopy::enable_if_c<ScalarTraits<Scalar>::value,
std::enable_if<ScalarTraits<Scalar>::value,
const Scalar>::type * /*sfinae*/)
{
_coords[0] = x;
Expand Down Expand Up @@ -735,7 +735,7 @@ TypeVector<T> TypeVector<T>::operator - () const
template <typename T>
template <typename Scalar>
inline
typename boostcopy::enable_if_c<
typename std::enable_if<
ScalarTraits<Scalar>::value,
TypeVector<typename CompareTypes<T, Scalar>::supertype>>::type
TypeVector<T>::operator * (const Scalar & factor) const
Expand All @@ -762,7 +762,7 @@ TypeVector<T>::operator * (const Scalar & factor) const

template <typename T, typename Scalar>
inline
typename boostcopy::enable_if_c<
typename std::enable_if<
ScalarTraits<Scalar>::value,
TypeVector<typename CompareTypes<T, Scalar>::supertype>>::type
operator * (const Scalar & factor,
Expand Down Expand Up @@ -800,7 +800,7 @@ const TypeVector<T> & TypeVector<T>::operator *= (const T & factor)
template <typename T>
template <typename Scalar>
inline
typename boostcopy::enable_if_c<
typename std::enable_if<
ScalarTraits<Scalar>::value,
TypeVector<typename CompareTypes<T, Scalar>::supertype>>::type
TypeVector<T>::operator / (const Scalar & factor) const
Expand Down
Loading