1 files changed, 9 insertions, 9 deletions
diff --git a/Eigen/src/Core/Random.h b/Eigen/src/Core/Random.h
index 36b8c9ee5..03f08ef06 100644
--- a/Eigen/src/Core/Random.h
+++ b/Eigen/src/Core/Random.h
@@ -35,13 +35,13 @@
 template<typename MatrixType>
 struct ei_traits<Random<MatrixType> >
 {
-  typedef typename MatrixType::Scalar Scalar;
+  typedef typename ei_traits<MatrixType>::Scalar Scalar;
   enum {
-    RowsAtCompileTime = MatrixType::RowsAtCompileTime,
-    ColsAtCompileTime = MatrixType::ColsAtCompileTime,
-    MaxRowsAtCompileTime = MatrixType::MaxRowsAtCompileTime,
-    MaxColsAtCompileTime = MatrixType::MaxColsAtCompileTime,
-    Flags = MatrixType::Flags
+    RowsAtCompileTime = ei_traits<MatrixType>::RowsAtCompileTime,
+    ColsAtCompileTime = ei_traits<MatrixType>::ColsAtCompileTime,
+    MaxRowsAtCompileTime = ei_traits<MatrixType>::MaxRowsAtCompileTime,
+    MaxColsAtCompileTime = ei_traits<MatrixType>::MaxColsAtCompileTime,
+    Flags = ei_traits<MatrixType>::Flags
   };
 };
 
@@ -92,7 +92,7 @@ template<typename MatrixType> class Random : ei_no_assignment_operator,
   * \sa ei_random(), ei_random(int)
   */
 template<typename Derived>
-const Eval<Random<Derived> >
+const typename ei_eval_unless_lazy<Random<Derived> >::Type
 MatrixBase<Derived>::random(int rows, int cols)
 {
   return Random<Derived>(rows, cols).eval();
@@ -115,7 +115,7 @@ MatrixBase<Derived>::random(int rows, int cols)
   * \sa ei_random(), ei_random(int,int)
   */
 template<typename Derived>
-const Eval<Random<Derived> >
+const typename ei_eval_unless_lazy<Random<Derived> >::Type
 MatrixBase<Derived>::random(int size)
 {
   ei_assert(IsVectorAtCompileTime);
@@ -135,7 +135,7 @@ MatrixBase<Derived>::random(int size)
   * \sa ei_random(int), ei_random(int,int)
   */
 template<typename Derived>
-const Eval<Random<Derived> >
+const typename ei_eval_unless_lazy<Random<Derived> >::Type
 MatrixBase<Derived>::random()
 {
   return Random<Derived>(RowsAtCompileTime, ColsAtCompileTime).eval();