1 files changed, 2 insertions, 112 deletions

diff --git a/boost/numeric/ublas/detail/concepts.hpp b/boost/numeric/ublas/detail/concepts.hpp
index 674c610ed5..21d5501456 100644
--- a/boost/numeric/ublas/detail/concepts.hpp
+++ b/boost/numeric/ublas/detail/concepts.hpp
@@ -644,7 +644,7 @@ namespace boost { namespace numeric { namespace ublas {
     template<class T>
     T
     ZeroElement (T) {
-        return T(0.0);
+        return static_cast<T> (0);
     }
 
     template<class T>
@@ -662,13 +662,7 @@ namespace boost { namespace numeric { namespace ublas {
     template<class T>
     T
     OneElement (T) {
-        return T(0.0);
-    }
-
-    template<class T>
-    vector<T>
-    OneElement (vector<T>) {
-        return zero_vector<T> ();
+        return static_cast<T> (1);
     }
 
     template<class T>
@@ -677,110 +671,6 @@ namespace boost { namespace numeric { namespace ublas {
         return identity_matrix<T> ();
     }
 
-//    template<>
-//    float
-//    ZeroElement (float) {
-//        return 0.f;
-//    }
-//    template<>
-//    double
-//    ZeroElement (double) {
-//        return 0.;
-//    }
-//    template<>
-//    vector<float>
-//    ZeroElement (vector<float>) {
-//        return zero_vector<float> ();
-//    }
-//    template<>
-//    vector<double>
-//    ZeroElement (vector<double>) {
-//        return zero_vector<double> ();
-//    }
-//    template<>
-//    matrix<float>
-//    ZeroElement (matrix<float>) {
-//        return zero_matrix<float> ();
-//    }
-//    template<>
-//    matrix<double>
-//    ZeroElement (matrix<double>) {
-//        return zero_matrix<double> ();
-//    }
-//    template<>
-//    std::complex<float>
-//    ZeroElement (std::complex<float>) {
-//        return std::complex<float> (0.f);
-//    }
-//    template<>
-//    std::complex<double>
-//    ZeroElement (std::complex<double>) {
-//        return std::complex<double> (0.);
-//    }
-//    template<>
-//    vector<std::complex<float> >
-//    ZeroElement (vector<std::complex<float> >) {
-//        return zero_vector<std::complex<float> > ();
-//    }
-//    template<>
-//    vector<std::complex<double> >
-//    ZeroElement (vector<std::complex<double> >) {
-//        return zero_vector<std::complex<double> > ();
-//    }
-//    template<>
-//    matrix<std::complex<float> >
-//    ZeroElement (matrix<std::complex<float> >) {
-//        return zero_matrix<std::complex<float> > ();
-//    }
-//    template<>
-//    matrix<std::complex<double> >
-//    ZeroElement (matrix<std::complex<double> >) {
-//        return zero_matrix<std::complex<double> > ();
-//    }
-
-//    template<class T>
-//    T
-//    OneElement (T);
-//    template<>
-//    float
-//    OneElement (float) {
-//        return 1.f;
-//    }
-//    template<>
-//    double
-//    OneElement (double) {
-//        return 1.;
-//    }
-//    template<>
-//    matrix<float>
-//    OneElement (matrix<float>) {
-//        return identity_matrix<float> ();
-//    }
-//    template<>
-//    matrix<double>
-//    OneElement (matrix<double>) {
-//        return identity_matrix<double> ();
-//    }
-//    template<>
-//    std::complex<float>
-//    OneElement (std::complex<float>) {
-//        return std::complex<float> (1.f);
-//    }
-//    template<>
-//    std::complex<double>
-//    OneElement (std::complex<double>) {
-//        return std::complex<double> (1.);
-//    }
-//    template<>
-//    matrix<std::complex<float> >
-//    OneElement (matrix<std::complex<float> >) {
-//        return identity_matrix<std::complex<float> > ();
-//    }
-//    template<>
-//    matrix<std::complex<double> >
-//    OneElement (matrix<std::complex<double> >) {
-//        return identity_matrix<std::complex<double> > ();
-//    }
 
     template<class E1, class E2>
     bool