remove support for type std::complex<int>. Simplify NumTraits accordingly.

5 files changed, 6 insertions, 21 deletions

diff --git a/src/Core/Dot.h b/src/Core/Dot.h
index 5f0fed8b5..e630d669c 100644
--- a/src/Core/Dot.h
+++ b/src/Core/Dot.h
@@ -84,7 +84,7 @@ typename NumTraits<Scalar>::Real Object<Scalar, Derived>::norm2() const
 template<typename Scalar, typename Derived>
 typename NumTraits<Scalar>::Real Object<Scalar, Derived>::norm() const
 {
-  return NumTraits<typename NumTraits<Scalar>::Real>::sqrt(norm2());
+  return std::sqrt(norm2());
 }
 
 template<typename Scalar, typename Derived>
diff --git a/src/Core/Matrix.h b/src/Core/Matrix.h
index aad999a04..518057d9f 100644
--- a/src/Core/Matrix.h
+++ b/src/Core/Matrix.h
@@ -110,7 +110,6 @@ EI_MAKE_TYPEDEFS(Type, TypeSuffix, Dynamic, X)
 EI_MAKE_TYPEDEFS_ALL_SIZES(int,                  i)
 EI_MAKE_TYPEDEFS_ALL_SIZES(float,                f)
 EI_MAKE_TYPEDEFS_ALL_SIZES(double,               d)
-EI_MAKE_TYPEDEFS_ALL_SIZES(std::complex<int>,    ci)
 EI_MAKE_TYPEDEFS_ALL_SIZES(std::complex<float>,  cf)
 EI_MAKE_TYPEDEFS_ALL_SIZES(std::complex<double>, cd)
 
@@ -132,7 +131,6 @@ EI_USING_MATRIX_TYPEDEFS_FOR_TYPE_AND_SIZE(TypeSuffix, X)
 EI_USING_MATRIX_TYPEDEFS_FOR_TYPE(i) \
 EI_USING_MATRIX_TYPEDEFS_FOR_TYPE(f) \
 EI_USING_MATRIX_TYPEDEFS_FOR_TYPE(d) \
-EI_USING_MATRIX_TYPEDEFS_FOR_TYPE(ci) \
 EI_USING_MATRIX_TYPEDEFS_FOR_TYPE(cf) \
 EI_USING_MATRIX_TYPEDEFS_FOR_TYPE(cd)
 
diff --git a/src/Core/NumTraits.h b/src/Core/NumTraits.h
index 3ef3615cd..68fa1cc71 100644
--- a/src/Core/NumTraits.h
+++ b/src/Core/NumTraits.h
@@ -42,8 +42,6 @@ template<> struct NumTraits<int>
   static int real(const int& x) { return x; }
   static int imag(const int& x) { EI_UNUSED(x); return 0; }
   static int conj(const int& x) { return x; }
-  static double sqrt(const int& x) { return std::sqrt(static_cast<double>(x)); }
-  static int abs(const int& x) { return std::abs(x); }
   static int abs2(const int& x) { return x*x; }
   static int random()
   {
@@ -83,8 +81,6 @@ template<> struct NumTraits<float>
   static float real(const float& x) { return x; }
   static float imag(const float& x) { EI_UNUSED(x); return 0; }
   static float conj(const float& x) { return x; }
-  static float sqrt(const float& x) { return std::sqrt(x); }
-  static float abs(const float& x) { return std::abs(x); }
   static float abs2(const float& x) { return x*x; }
   static float random()
   {
@@ -92,11 +88,11 @@ template<> struct NumTraits<float>
   }
   static bool isMuchSmallerThan(const float& a, const float& b, const float& prec = precision())
   {
-    return abs(a) <= abs(b) * prec;
+    return std::abs(a) <= std::abs(b) * prec;
   }
   static bool isApprox(const float& a, const float& b, const float& prec = precision())
   {
-    return abs(a - b) <= std::min(abs(a), abs(b)) * prec;
+    return std::abs(a - b) <= std::min(std::abs(a), std::abs(b)) * prec;
   }
   static bool isApproxOrLessThan(const float& a, const float& b, const float& prec = precision())
   {
@@ -117,8 +113,6 @@ template<> struct NumTraits<double>
   static double real(const double& x) { return x; }
   static double imag(const double& x) { EI_UNUSED(x); return 0; }
   static double conj(const double& x) { return x; }
-  static double sqrt(const double& x) { return std::sqrt(x); }
-  static double abs(const double& x) { return std::abs(x); }
   static double abs2(const double& x) { return x*x; }
   static double random()
   {
@@ -126,11 +120,11 @@ template<> struct NumTraits<double>
   }
   static bool isMuchSmallerThan(const double& a, const double& b, const double& prec = precision())
   {
-    return abs(a) <= abs(b) * prec;
+    return std::abs(a) <= std::abs(b) * prec;
   }
   static bool isApprox(const double& a, const double& b, const double& prec = precision())
   {
-    return abs(a - b) <= std::min(abs(a), abs(b)) * prec;
+    return std::abs(a - b) <= std::min(std::abs(a), std::abs(b)) * prec;
   }
   static bool isApproxOrLessThan(const double& a, const double& b, const double& prec = precision())
   {
@@ -152,12 +146,8 @@ template<typename _Real> struct NumTraits<std::complex<_Real> >
   static Real real(const Complex& x) { return std::real(x); }
   static Real imag(const Complex& x) { return std::imag(x); }
   static Complex conj(const Complex& x) { return std::conj(x); }
-  static FloatingPoint sqrt(const Complex& x)
-  { return std::sqrt(static_cast<FloatingPoint>(x)); }
-  static RealFloatingPoint abs(const Complex& x)
-  { return std::abs(static_cast<FloatingPoint>(x)); }
   static Real abs2(const Complex& x)
-  { return std::real(x) * std::real(x) + std::imag(x) * std::imag(x); }
+  { return std::norm(x); }
   static Complex random()
   {
     return Complex(NumTraits<Real>::random(), NumTraits<Real>::random());
diff --git a/src/Core/Object.h b/src/Core/Object.h
index 72928406b..95f540f10 100644
--- a/src/Core/Object.h
+++ b/src/Core/Object.h
@@ -145,14 +145,12 @@ template<typename Scalar, typename Derived> class Object
     Derived& operator*=(const int& other);
     Derived& operator*=(const float& other);
     Derived& operator*=(const double& other);
-    Derived& operator*=(const std::complex<int>& other);
     Derived& operator*=(const std::complex<float>& other);
     Derived& operator*=(const std::complex<double>& other);
     
     Derived& operator/=(const int& other);
     Derived& operator/=(const float& other);
     Derived& operator/=(const double& other);
-    Derived& operator/=(const std::complex<int>& other);
     Derived& operator/=(const std::complex<float>& other);
     Derived& operator/=(const std::complex<double>& other);
 
diff --git a/src/Core/ScalarMultiple.h b/src/Core/ScalarMultiple.h
index 8532411a6..137804c43 100644
--- a/src/Core/ScalarMultiple.h
+++ b/src/Core/ScalarMultiple.h
@@ -104,7 +104,6 @@ Object<Scalar, Derived>::operator/=(const OtherScalar &other)        \
 EI_MAKE_SCALAR_OPS(int)
 EI_MAKE_SCALAR_OPS(float)
 EI_MAKE_SCALAR_OPS(double)
-EI_MAKE_SCALAR_OPS(std::complex<int>)
 EI_MAKE_SCALAR_OPS(std::complex<float>)
 EI_MAKE_SCALAR_OPS(std::complex<double>)