diff options
| author |  Benoit Steiner <benoit.steiner.goog@gmail.com> | 2016-11-27 07:27:30 -0800 |
|---|---|---|
| committer | Benoit Steiner <benoit.steiner.goog@gmail.com> | 2016-11-27 07:27:30 -0800 |
| commit | 02080e2b673c17302872a05e0fac8c20ac756b44 (patch) | |
| tree | afb88c655ab9d4b88653b66fd4abe1041f46b8db /unsupported/Eigen | |
| parent | 9f8fbd9434a604e54fee59460cbd13fe629299fa (diff) | |
| parent | 9fd081cddc1ec97b1e65e8c10172914b0ecf2a2f (diff) | |
Merged eigen/eigen into default
Diffstat (limited to 'unsupported/Eigen')
| -rw-r--r-- | unsupported/Eigen/CXX11/src/util/CXX11Meta.h | 2 | ||||
| -rw-r--r-- | unsupported/Eigen/src/SpecialFunctions/SpecialFunctionsImpl.h | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/unsupported/Eigen/CXX11/src/util/CXX11Meta.h b/unsupported/Eigen/CXX11/src/util/CXX11Meta.h index 63c2a1def..1e3aef8c2 100644 --- a/unsupported/Eigen/CXX11/src/util/CXX11Meta.h +++ b/unsupported/Eigen/CXX11/src/util/CXX11Meta.h @@ -123,7 +123,7 @@ template<typename a, typename... as> struct get<0, type_lis template<typename T, int n, T a, T... as> struct get<n, numeric_list<T, a, as...>> : get<n-1, numeric_list<T, as...>> {}; template<typename T, T a, T... as> struct get<0, numeric_list<T, a, as...>> { constexpr static T value = a; }; -template<std::size_t n, typename T, T a, T... as> constexpr inline const T array_get(const numeric_list<T, a, as...>& l) { +template<std::size_t n, typename T, T a, T... as> constexpr inline const T array_get(const numeric_list<T, a, as...>&) { return get<(int)n, numeric_list<T, a, as...>>::value; } diff --git a/unsupported/Eigen/src/SpecialFunctions/SpecialFunctionsImpl.h b/unsupported/Eigen/src/SpecialFunctions/SpecialFunctionsImpl.h index f524d7137..369ad97b4 100644 --- a/unsupported/Eigen/src/SpecialFunctions/SpecialFunctionsImpl.h +++ b/unsupported/Eigen/src/SpecialFunctions/SpecialFunctionsImpl.h @@ -122,8 +122,8 @@ struct lgamma_impl<float> { EIGEN_DEVICE_FUNC static EIGEN_STRONG_INLINE float run(float x) { #if !defined(__CUDA_ARCH__) && (defined(_BSD_SOURCE) || defined(_SVID_SOURCE)) && !defined(__APPLE__) - int signgam; - return ::lgammaf_r(x, &signgam); + int dummy; + return ::lgammaf_r(x, &dummy); #else return ::lgammaf(x); #endif @@ -135,8 +135,8 @@ struct lgamma_impl<double> { EIGEN_DEVICE_FUNC static EIGEN_STRONG_INLINE double run(double x) { #if !defined(__CUDA_ARCH__) && (defined(_BSD_SOURCE) || defined(_SVID_SOURCE)) && !defined(__APPLE__) - int signgam; - return ::lgamma_r(x, &signgam); + int dummy; + return ::lgamma_r(x, &dummy); #else return ::lgamma(x); #endif |