aboutsummaryrefslogtreecommitdiffhomepage
path: root/Eigen/src/Core
diff options
context:
space:
mode:
authorGravatar Angelos Mantzaflaris <Angelos.Mantzaflaris@oeaw.ac.at>2016-12-01 21:23:43 +0100
committerGravatar Angelos Mantzaflaris <Angelos.Mantzaflaris@oeaw.ac.at>2016-12-01 21:23:43 +0100
commitaeba0d865543634c9b3fe176cfe055268b305da5 (patch)
tree4ac8bc95abaca3c6baea068afdab8a88033adb22 /Eigen/src/Core
parent27873008d431a307bed9c200a12622a361af4d14 (diff)
fix two warnings(unused typedef, unused variable) and a typo
Diffstat (limited to 'Eigen/src/Core')
-rw-r--r--Eigen/src/Core/Dot.h4
-rw-r--r--Eigen/src/Core/PlainObjectBase.h1
-rw-r--r--Eigen/src/Core/util/Memory.h2
3 files changed, 5 insertions, 2 deletions
diff --git a/Eigen/src/Core/Dot.h b/Eigen/src/Core/Dot.h
index 1d7f2262e..f4fb4db7e 100644
--- a/Eigen/src/Core/Dot.h
+++ b/Eigen/src/Core/Dot.h
@@ -70,9 +70,11 @@ MatrixBase<Derived>::dot(const MatrixBase<OtherDerived>& other) const
EIGEN_STATIC_ASSERT_VECTOR_ONLY(Derived)
EIGEN_STATIC_ASSERT_VECTOR_ONLY(OtherDerived)
EIGEN_STATIC_ASSERT_SAME_VECTOR_SIZE(Derived,OtherDerived)
+#if !(defined(EIGEN_NO_STATIC_ASSERT) && defined(EIGEN_NO_DEBUG))
typedef internal::scalar_conj_product_op<Scalar,typename OtherDerived::Scalar> func;
EIGEN_CHECK_BINARY_COMPATIBILIY(func,Scalar,typename OtherDerived::Scalar);
-
+#endif
+
eigen_assert(size() == other.size());
return internal::dot_nocheck<Derived,OtherDerived>::run(*this, other);
diff --git a/Eigen/src/Core/PlainObjectBase.h b/Eigen/src/Core/PlainObjectBase.h
index 2dcd929e6..0c04f8250 100644
--- a/Eigen/src/Core/PlainObjectBase.h
+++ b/Eigen/src/Core/PlainObjectBase.h
@@ -763,6 +763,7 @@ class PlainObjectBase : public internal::dense_xpr_base<Derived>::type
{
// NOTE MSVC 2008 complains if we directly put bool(NumTraits<T>::IsInteger) as the EIGEN_STATIC_ASSERT argument.
const bool is_integer = NumTraits<T>::IsInteger;
+ EIGEN_UNUSED_VARIABLE(is_integer);
EIGEN_STATIC_ASSERT(is_integer,
FLOATING_POINT_ARGUMENT_PASSED__INTEGER_WAS_EXPECTED)
resize(size);
diff --git a/Eigen/src/Core/util/Memory.h b/Eigen/src/Core/util/Memory.h
index 0439655ca..741f35a0d 100644
--- a/Eigen/src/Core/util/Memory.h
+++ b/Eigen/src/Core/util/Memory.h
@@ -523,7 +523,7 @@ template<typename T> struct smart_memmove_helper<T,true> {
template<typename T> struct smart_memmove_helper<T,false> {
static inline void run(const T* start, const T* end, T* target)
{
- if (uintptr_t(target) < uintptr_t(start))
+ if (IntPtr(target) < IntPtr(start))
{
std::copy(start, end, target);
}