diff -r dcee1338df33 boost/numeric/ublas/traits.hpp
--- a/boost/numeric/ublas/traits.hpp	Tue Sep 29 15:01:07 2009 -0400
+++ b/boost/numeric/ublas/traits.hpp	Fri Oct 09 08:50:15 2009 -0400
@@ -26,6 +26,8 @@
 #include <boost/typeof/typeof.hpp>
 #include <boost/utility/enable_if.hpp>
 #include <boost/type_traits/is_float.hpp>
+#include <boost/type_traits/is_integral.hpp>
+#include <boost/mpl/and.hpp>
 
 // anonymous namespace to avoid ADL issues
 namespace {
@@ -43,43 +45,83 @@
 
 namespace boost { namespace numeric { namespace ublas {
 
-      template<typename R> 
-      typename boost::enable_if<boost::is_float<R>, std::complex<R> >::type inline operator+ (int in1, std::complex<R> const& in2 ) {
+      template<typename R, typename I> 
+      typename boost::enable_if<
+	mpl::and_<
+	  boost::is_float<R>,
+	  boost::is_integral<I>
+	  >,
+	std::complex<R> >::type inline operator+ (I in1, std::complex<R> const& in2 ) {
 	return R (in1) + in2;
       }
 
-      template<typename R>
-      typename boost::enable_if<boost::is_float<R>, std::complex<R> >::type inline operator+ (std::complex<R> const& in1, int in2) {
+      template<typename R, typename I> 
+      typename boost::enable_if<
+	mpl::and_<
+	  boost::is_float<R>,
+	  boost::is_integral<I>
+	  >,
+	std::complex<R> >::type inline operator+ (std::complex<R> const& in1, I in2) {
 	return in1 + R (in2);
       }
 
-      template<typename R>
-      typename boost::enable_if<boost::is_float<R>, std::complex<R> >::type  inline operator- (int in1, std::complex<R> const& in2) {
+      template<typename R, typename I> 
+      typename boost::enable_if<
+	mpl::and_<
+	  boost::is_float<R>,
+	  boost::is_integral<I>
+	  >,
+	std::complex<R> >::type inline operator- (I in1, std::complex<R> const& in2) {
 	return R (in1) - in2;
       }
 
-      template<typename R>
-      typename boost::enable_if<boost::is_float<R>, std::complex<R> >::type  inline operator- (std::complex<R> const& in1, int in2) {
+      template<typename R, typename I> 
+      typename boost::enable_if<
+	mpl::and_<
+	  boost::is_float<R>,
+	  boost::is_integral<I>
+	  >,
+	std::complex<R> >::type inline operator- (std::complex<R> const& in1, I in2) {
 	return in1 - R (in2);
       }
 
-      template<typename R>
-      typename boost::enable_if<boost::is_float<R>, std::complex<R> >::type  inline operator* (int in1, std::complex<R> const& in2) {
+      template<typename R, typename I> 
+      typename boost::enable_if<
+	mpl::and_<
+	  boost::is_float<R>,
+	  boost::is_integral<I>
+	  >,
+	std::complex<R> >::type inline operator* (I in1, std::complex<R> const& in2) {
 	return R (in1) * in2;
       }
 
-      template<typename R>
-      typename boost::enable_if<boost::is_float<R>, std::complex<R> >::type inline operator* (std::complex<R> const& in1, int in2) {
+      template<typename R, typename I> 
+      typename boost::enable_if<
+	mpl::and_<
+	  boost::is_float<R>,
+	  boost::is_integral<I>
+	  >,
+	std::complex<R> >::type inline operator* (std::complex<R> const& in1, I in2) {
 	return in1 * R(in2);
       }
 
-      template<typename R>
-      typename boost::enable_if<boost::is_float<R>, std::complex<R> >::type  inline operator/ (int in1, std::complex<R> const& in2) {
+      template<typename R, typename I> 
+      typename boost::enable_if<
+	mpl::and_<
+	  boost::is_float<R>,
+	  boost::is_integral<I>
+	  >,
+	std::complex<R> >::type inline operator/ (I in1, std::complex<R> const& in2) {
 	return R(in1) / in2;
       }
 
-      template<typename R>
-      typename boost::enable_if<boost::is_float<R>, std::complex<R> >::type  inline operator/ (std::complex<R> const& in1, int in2) {
+      template<typename R, typename I> 
+      typename boost::enable_if<
+	mpl::and_<
+	  boost::is_float<R>,
+	  boost::is_integral<I>
+	  >,
+	std::complex<R> >::type inline operator/ (std::complex<R> const& in1, I in2) {
 	return in1 / R (in2);
       }