Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed build for VS2017. #24

Open
wants to merge 1 commit into
base: public
Choose a base branch
from
+8 −6
Open

Fixed build for VS2017. #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 flens/lapack/la/ilaenv.tcc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,7 @@ ilaenv_impl(int spec, const char *name, const char *opts,
}
}
}
result = nx/1.5;
result = static_cast<int>(static_cast<double>(nx)/1.5);
break;
//
// DEPRECATED: number of shifts used in the nonsymmetric eigenvalue
Expand Down
4 changes: 3 additions & 1 deletion flens/vectortypes/impl/densevector.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@ class DenseVector
typedef DenseVector<EngineView> View;
typedef DenseVector<EngineNoView> NoView;

static const IndexType defaultIndexBase = Engine::defaultIndexBase;

private:
typedef DenseVector DV;

Expand Down Expand Up @@ -229,7 +231,7 @@ class DenseVector

bool
resize(IndexType length,
IndexType firstIndex = Engine::defaultIndexBase,
IndexType firstIndex = defaultIndexBase,
const ElementType &value = ElementType());

bool
Expand Down
8 changes: 4 additions & 4 deletions flens/vectortypes/impl/densevector.tcc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ DenseVector<A>::operator-=(const Vector<E> &rhs)

template <typename A>
template <typename T>
typename RestrictTo<IsConvertible<T,typename A::ElementType>::value,
typename RestrictTo<IsConvertible<T,typename DenseVector<A>::Engine::ElementType>::value,
DenseVector<A> >::Type &
DenseVector<A>::operator+=(const T &alpha)
{
Expand All @@ -172,7 +172,7 @@ DenseVector<A>::operator+=(const T &alpha)

template <typename A>
template <typename T>
typename RestrictTo<IsConvertible<T,typename A::ElementType>::value,
typename RestrictTo<IsConvertible<T,typename DenseVector<A>::Engine::ElementType>::value,
DenseVector<A> >::Type &
DenseVector<A>::operator-=(const T &alpha)
{
Expand All @@ -184,7 +184,7 @@ DenseVector<A>::operator-=(const T &alpha)

template <typename A>
template <typename T>
typename RestrictTo<IsConvertible<T,typename A::ElementType>::value,
typename RestrictTo<IsConvertible<T,typename DenseVector<A>::Engine::ElementType>::value,
DenseVector<A> >::Type &
DenseVector<A>::operator*=(const T &alpha)
{
Expand All @@ -194,7 +194,7 @@ DenseVector<A>::operator*=(const T &alpha)

template <typename A>
template <typename T>
typename RestrictTo<IsConvertible<T,typename A::ElementType>::value,
typename RestrictTo<IsConvertible<T,typename DenseVector<A>::Engine::ElementType>::value,
DenseVector<A> >::Type &
DenseVector<A>::operator/=(const T &alpha)
{
Expand Down