Adjusted the EIGEN_DEVICE_FUNC qualifiers to make sure that:

* they're used consistently between the declaration and the definition of a function
  * we avoid calling host only methods from host device methods.
This commit is contained in:
Benoit Steiner
2017-03-01 11:47:47 -08:00
parent 1e2d046651
commit 09ae0e6586
13 changed files with 25 additions and 27 deletions

View File

@@ -151,9 +151,9 @@ struct get_fixed_value<variable_if_dynamic<T,N>,Default> {
static const int value = N;
};
template<typename T> Index get_runtime_value(const T &x) { return x; }
template<typename T> EIGEN_DEVICE_FUNC Index get_runtime_value(const T &x) { return x; }
#if !EIGEN_HAS_CXX14
template<int N> Index get_runtime_value(FixedInt<N> (*)()) { return N; }
template<int N> EIGEN_DEVICE_FUNC Index get_runtime_value(FixedInt<N> (*)()) { return N; }
#endif
// Cleanup integer/FixedInt/VariableAndFixedInt/etc types: