diff --git a/Eigen/src/Core/util/Macros.h b/Eigen/src/Core/util/Macros.h
index 7462dc5cf..8045a2879 100644
--- a/Eigen/src/Core/util/Macros.h
+++ b/Eigen/src/Core/util/Macros.h
@@ -870,7 +870,8 @@ namespace Eigen {
   typedef typename Eigen::internal::ref_selector<Derived>::type Nested; \
   typedef typename Eigen::internal::traits<Derived>::StorageKind StorageKind; \
   typedef typename Eigen::internal::traits<Derived>::StorageIndex StorageIndex; \
-  enum { RowsAtCompileTime = Eigen::internal::traits<Derived>::RowsAtCompileTime, \
+  enum CompileTimeTraits \
+      { RowsAtCompileTime = Eigen::internal::traits<Derived>::RowsAtCompileTime, \
         ColsAtCompileTime = Eigen::internal::traits<Derived>::ColsAtCompileTime, \
         Flags = Eigen::internal::traits<Derived>::Flags, \
         SizeAtCompileTime = Base::SizeAtCompileTime, \
diff --git a/test/indexed_view.cpp b/test/indexed_view.cpp
index 8fa1c16f4..909d2351d 100644
--- a/test/indexed_view.cpp
+++ b/test/indexed_view.cpp
@@ -226,7 +226,7 @@ void check_indexed_view()
   VERIFY( (B(all,1)).ColsAtCompileTime == 1);
   VERIFY( (B(all,1)).RowsAtCompileTime == 4);
 
-  VERIFY( (A(all, eii)).ColsAtCompileTime == eii.SizeAtCompileTime);
+  VERIFY(int( (A(all, eii)).ColsAtCompileTime) == int(eii.SizeAtCompileTime));
   VERIFY_EQ_INT( (A(eii, eii)).Flags&DirectAccessBit, (unsigned int)(0));
   VERIFY_EQ_INT( (A(eii, eii)).InnerStrideAtCompileTime, 0);
   VERIFY_EQ_INT( (A(eii, eii)).OuterStrideAtCompileTime, 0);
@@ -320,7 +320,7 @@ void check_indexed_view()
     VERIFY_IS_APPROX( A(B.RowsAtCompileTime, 1), A(4,1) );
     VERIFY_IS_APPROX( A(B.RowsAtCompileTime-1, B.ColsAtCompileTime-1), A(3,3) );
     VERIFY_IS_APPROX( A(B.RowsAtCompileTime, B.ColsAtCompileTime), A(4,4) );
-    enum { I = 3, J = 4 };
+    const Index I = 3, J = 4;
     VERIFY_IS_APPROX( A(I,J), A(3,4) );
   }