diff --git a/Jamfile b/Jamfile
index ed8eaa62..591919d2 100644
--- a/Jamfile
+++ b/Jamfile
@@ -74,8 +74,8 @@ test-suite numeric/uBLAS
         : # requirements
             <vacpp><*><define>"BOOST_UBLAS_NO_ELEMENT_PROXIES"
       ]
-# Test7 check uBLAS operation with interval types.
-# This causes to much compiler badness, issues need to be addressed for VC7.1 VC8 CW9 and Intel 8 (windows)
+# Test7 checks uBLAS operation with interval types.
+# This causes too much compiler badness. Issues need to be addressed for VC7.1 VC8 CW9 and Intel 8 (windows)
 #      [ run test7/test7.cpp
 #            test7/test71.cpp
 #            test7/test72.cpp
diff --git a/Jamfile.v2 b/Jamfile.v2
index 7bfc9dd0..b818be1d 100644
--- a/Jamfile.v2
+++ b/Jamfile.v2
@@ -47,15 +47,17 @@ test-suite numeric/uBLAS
             test6/test62.cpp
             test6/test63.cpp
       ]
-      [ run test7/test7.cpp
-            test7/test71.cpp
-            test7/test72.cpp
-            test7/test73.cpp
-        : # args
-        : # input files
-        : # requirements
-	    <define>BOOST_UBLAS_USE_INTERVAL
-      ]
+# Test7 checks uBLAS operation with interval types.
+# This causes too much compiler badness. Issues need to be addressed for VC7.1 VC8 CW9 and Intel 8 (windows)
+#      [ run test7/test7.cpp
+#            test7/test71.cpp
+#            test7/test72.cpp
+#            test7/test73.cpp
+#        : # args
+#        : # input files
+#        : # requirements
+#	    <define>BOOST_UBLAS_USE_INTERVAL
+#      ]
       [ compile concepts.cpp
       ]
     ;
diff --git a/bench1/bench1.cpp b/bench1/bench1.cpp
index f004b42d..63c51eff 100644
--- a/bench1/bench1.cpp
+++ b/bench1/bench1.cpp
@@ -14,14 +14,6 @@
 //  GeNeSys mbH & Co. KG in producing this work.
 //
 
-#ifdef BOOST_MSVC
-
-#pragma warning (disable: 4355)
-#pragma warning (disable: 4503)
-#pragma warning (disable: 4786)
-
-#endif
-
 #include <iostream>
 #include <string>
 
diff --git a/bench1/bench11.cpp b/bench1/bench11.cpp
index b50b462f..edb8f57c 100644
--- a/bench1/bench11.cpp
+++ b/bench1/bench11.cpp
@@ -14,14 +14,6 @@
 //  GeNeSys mbH & Co. KG in producing this work.
 //
 
-#ifdef BOOST_MSVC
-
-#pragma warning (disable: 4355)
-#pragma warning (disable: 4503)
-#pragma warning (disable: 4786)
-
-#endif
-
 #include <iostream>
 #include <string>
 
diff --git a/bench1/bench12.cpp b/bench1/bench12.cpp
index 361c208e..15680850 100644
--- a/bench1/bench12.cpp
+++ b/bench1/bench12.cpp
@@ -14,14 +14,6 @@
 //  GeNeSys mbH & Co. KG in producing this work.
 //
 
-#ifdef BOOST_MSVC
-
-#pragma warning (disable: 4355)
-#pragma warning (disable: 4503)
-#pragma warning (disable: 4786)
-
-#endif
-
 #include <iostream>
 #include <string>
 
diff --git a/bench1/bench13.cpp b/bench1/bench13.cpp
index 5c6ccd5a..5616232b 100644
--- a/bench1/bench13.cpp
+++ b/bench1/bench13.cpp
@@ -14,14 +14,6 @@
 //  GeNeSys mbH & Co. KG in producing this work.
 //
 
-#ifdef BOOST_MSVC
-
-#pragma warning (disable: 4355)
-#pragma warning (disable: 4503)
-#pragma warning (disable: 4786)
-
-#endif
-
 #include <iostream>
 #include <string>
 
diff --git a/bench2/bench2.cpp b/bench2/bench2.cpp
index ca0594b5..6e4a3c65 100644
--- a/bench2/bench2.cpp
+++ b/bench2/bench2.cpp
@@ -14,14 +14,6 @@
 //  GeNeSys mbH & Co. KG in producing this work.
 //
 
-#ifdef BOOST_MSVC
-
-#pragma warning (disable: 4355)
-#pragma warning (disable: 4503)
-#pragma warning (disable: 4786)
-
-#endif
-
 #include <iostream>
 #include <string>
 
diff --git a/bench2/bench21.cpp b/bench2/bench21.cpp
index 4470c62a..bb5de69c 100644
--- a/bench2/bench21.cpp
+++ b/bench2/bench21.cpp
@@ -14,14 +14,6 @@
 //  GeNeSys mbH & Co. KG in producing this work.
 //
 
-#ifdef BOOST_MSVC
-
-#pragma warning (disable: 4355)
-#pragma warning (disable: 4503)
-#pragma warning (disable: 4786)
-
-#endif
-
 #include <iostream>
 #include <string>
 
diff --git a/bench2/bench22.cpp b/bench2/bench22.cpp
index 7853b5e5..35fdb1fa 100644
--- a/bench2/bench22.cpp
+++ b/bench2/bench22.cpp
@@ -14,14 +14,6 @@
 //  GeNeSys mbH & Co. KG in producing this work.
 //
 
-#ifdef BOOST_MSVC
-
-#pragma warning (disable: 4355)
-#pragma warning (disable: 4503)
-#pragma warning (disable: 4786)
-
-#endif
-
 #include <iostream>
 #include <string>
 
diff --git a/bench2/bench23.cpp b/bench2/bench23.cpp
index 96a5d96b..dea2b261 100644
--- a/bench2/bench23.cpp
+++ b/bench2/bench23.cpp
@@ -14,14 +14,6 @@
 //  GeNeSys mbH & Co. KG in producing this work.
 //
 
-#ifdef BOOST_MSVC
-
-#pragma warning (disable: 4355)
-#pragma warning (disable: 4503)
-#pragma warning (disable: 4786)
-
-#endif
-
 #include <iostream>
 #include <string>
 
diff --git a/bench3/bench3.cpp b/bench3/bench3.cpp
index 67721b25..47e5014b 100644
--- a/bench3/bench3.cpp
+++ b/bench3/bench3.cpp
@@ -14,14 +14,6 @@
 //  GeNeSys mbH & Co. KG in producing this work.
 //
 
-#ifdef BOOST_MSVC
-
-#pragma warning (disable: 4355)
-#pragma warning (disable: 4503)
-#pragma warning (disable: 4786)
-
-#endif
-
 #include <iostream>
 #include <string>
 
diff --git a/bench3/bench31.cpp b/bench3/bench31.cpp
index 6c2ada24..a86be60e 100644
--- a/bench3/bench31.cpp
+++ b/bench3/bench31.cpp
@@ -14,14 +14,6 @@
 //  GeNeSys mbH & Co. KG in producing this work.
 //
 
-#ifdef BOOST_MSVC
-
-#pragma warning (disable: 4355)
-#pragma warning (disable: 4503)
-#pragma warning (disable: 4786)
-
-#endif
-
 #include <iostream>
 #include <string>
 
diff --git a/bench3/bench32.cpp b/bench3/bench32.cpp
index 27b9741f..44c59883 100644
--- a/bench3/bench32.cpp
+++ b/bench3/bench32.cpp
@@ -14,14 +14,6 @@
 //  GeNeSys mbH & Co. KG in producing this work.
 //
 
-#ifdef BOOST_MSVC
-
-#pragma warning (disable: 4355)
-#pragma warning (disable: 4503)
-#pragma warning (disable: 4786)
-
-#endif
-
 #include <iostream>
 #include <string>
 
diff --git a/bench3/bench33.cpp b/bench3/bench33.cpp
index 89154ae9..850fa0b1 100644
--- a/bench3/bench33.cpp
+++ b/bench3/bench33.cpp
@@ -14,14 +14,6 @@
 //  GeNeSys mbH & Co. KG in producing this work.
 //
 
-#ifdef BOOST_MSVC
-
-#pragma warning (disable: 4355)
-#pragma warning (disable: 4503)
-#pragma warning (disable: 4786)
-
-#endif
-
 #include <iostream>
 #include <string>
 
diff --git a/bench4/bench4.cpp b/bench4/bench4.cpp
index 816de541..eae292df 100644
--- a/bench4/bench4.cpp
+++ b/bench4/bench4.cpp
@@ -14,14 +14,6 @@
 //  GeNeSys mbH & Co. KG in producing this work.
 //
 
-#ifdef BOOST_MSVC
-
-#pragma warning (disable: 4355)
-#pragma warning (disable: 4503)
-#pragma warning (disable: 4786)
-
-#endif
-
 #include <iostream>
 #include <string>
 
diff --git a/bench4/bench41.cpp b/bench4/bench41.cpp
index 953973c3..d06c058d 100644
--- a/bench4/bench41.cpp
+++ b/bench4/bench41.cpp
@@ -14,14 +14,6 @@
 //  GeNeSys mbH & Co. KG in producing this work.
 //
 
-#ifdef BOOST_MSVC
-
-#pragma warning (disable: 4355)
-#pragma warning (disable: 4503)
-#pragma warning (disable: 4786)
-
-#endif
-
 #include <iostream>
 #include <string>
 
diff --git a/bench4/bench42.cpp b/bench4/bench42.cpp
index 2c530621..6d12c74e 100644
--- a/bench4/bench42.cpp
+++ b/bench4/bench42.cpp
@@ -14,14 +14,6 @@
 //  GeNeSys mbH & Co. KG in producing this work.
 //
 
-#ifdef BOOST_MSVC
-
-#pragma warning (disable: 4355)
-#pragma warning (disable: 4503)
-#pragma warning (disable: 4786)
-
-#endif
-
 #include <iostream>
 #include <string>
 
diff --git a/bench4/bench43.cpp b/bench4/bench43.cpp
index 2f0b0fcc..a7414349 100644
--- a/bench4/bench43.cpp
+++ b/bench4/bench43.cpp
@@ -14,14 +14,6 @@
 //  GeNeSys mbH & Co. KG in producing this work.
 //
 
-#ifdef BOOST_MSVC
-
-#pragma warning (disable: 4355)
-#pragma warning (disable: 4503)
-#pragma warning (disable: 4786)
-
-#endif
-
 #include <iostream>
 #include <string>
 
diff --git a/test1/test1.cpp b/test1/test1.cpp
index 3f436de2..2b29a827 100644
--- a/test1/test1.cpp
+++ b/test1/test1.cpp
@@ -14,14 +14,6 @@
 //  GeNeSys mbH & Co. KG in producing this work.
 //
 
-#ifdef BOOST_MSVC
-
-#pragma warning (disable: 4355)
-#pragma warning (disable: 4503)
-#pragma warning (disable: 4786)
-
-#endif
-
 #include <iostream>
 
 #include <boost/numeric/ublas/config.hpp>
diff --git a/test1/test1.hpp b/test1/test1.hpp
index 0ce9c65d..46d22f50 100644
--- a/test1/test1.hpp
+++ b/test1/test1.hpp
@@ -43,10 +43,10 @@ void test_matrix ();
 
 // #define USE_FLOAT
 #define USE_DOUBLE
-// #define USE_STD_COMPLEX
+#define USE_STD_COMPLEX
 
-// #define USE_RANGE
-// #define USE_SLICE
+#define USE_RANGE
+#define USE_SLICE
 
 // #define USE_BOUNDED_ARRAY
 #define USE_UNBOUNDED_ARRAY
diff --git a/test1/test11.cpp b/test1/test11.cpp
index 256b475f..5d821b12 100644
--- a/test1/test11.cpp
+++ b/test1/test11.cpp
@@ -14,14 +14,6 @@
 //  GeNeSys mbH & Co. KG in producing this work.
 //
 
-#ifdef BOOST_MSVC
-
-#pragma warning (disable: 4355)
-#pragma warning (disable: 4503)
-#pragma warning (disable: 4786)
-
-#endif
-
 #include <iostream>
 
 #include <boost/numeric/ublas/config.hpp>
@@ -88,17 +80,14 @@ struct test_my_vector {
             // Some assignments
             initialize_vector (v1);
             initialize_vector (v2);
-#ifdef BOOST_UBLAS_USE_ET
             v2 += v1;
             std::cout << "v2 += v1 = " << v2 << std::endl;
             v2 -= v1;
             std::cout << "v2 -= v1 = " << v2 << std::endl;
-#else
             v2 = v2 + v1;
-            std::cout << "v2 += v1 = " << v2 << std::endl;
+            std::cout << "v2 = v2 + v1 = " << v2 << std::endl;
             v2 = v2 - v1;
-            std::cout << "v2 -= v1 = " << v2 << std::endl;
-#endif
+            std::cout << "v2 = v2 - v1 = " << v2 << std::endl;
             v1 *= value_type (1.);
             std::cout << "v1 *= 1. = " << v1 << std::endl;
             v1 *= t;
diff --git a/test1/test12.cpp b/test1/test12.cpp
index a611dad6..cf93e385 100644
--- a/test1/test12.cpp
+++ b/test1/test12.cpp
@@ -14,14 +14,6 @@
 //  GeNeSys mbH & Co. KG in producing this work.
 //
 
-#ifdef BOOST_MSVC
-
-#pragma warning (disable: 4355)
-#pragma warning (disable: 4503)
-#pragma warning (disable: 4786)
-
-#endif
-
 #include <iostream>
 
 #include <boost/numeric/ublas/config.hpp>
@@ -81,11 +73,13 @@ struct test_my_matrix_vector {
             ublas::matrix_column<M> mc1 (m1, 0), mc2 (m1, 1);
             (*this) (mc1, mc2, m1);
 
-#ifdef USE_RANGE_AND_SLICE
+#ifdef USE_RANGE
             ublas::matrix_vector_range<M> mvr1 (m1, ublas::range (0, N), ublas::range (0, N)),
                                           mvr2 (m1, ublas::range (0, N), ublas::range (0, N));
             (*this) (mvr1, mvr2, m1);
+#endif
 
+#ifdef USE_SLICE
             ublas::matrix_vector_slice<M> mvs1 (m1, ublas::slice (0, 1, N), ublas::slice (0, 1, N)),
                                           mvs2 (m1, ublas::slice (0, 1, N), ublas::slice (0, 1, N));
             (*this) (mvs1, mvs2, m1);
diff --git a/test1/test13.cpp b/test1/test13.cpp
index 1515f24c..93d33eae 100644
--- a/test1/test13.cpp
+++ b/test1/test13.cpp
@@ -14,14 +14,6 @@
 //  GeNeSys mbH & Co. KG in producing this work.
 //
 
-#ifdef BOOST_MSVC
-
-#pragma warning (disable: 4355)
-#pragma warning (disable: 4503)
-#pragma warning (disable: 4786)
-
-#endif
-
 #include <iostream>
 
 #include <boost/numeric/ublas/config.hpp>
@@ -84,17 +76,14 @@ struct test_my_matrix {
             // Some assignments
             initialize_matrix (m1);
             initialize_matrix (m2);
-#ifdef BOOST_UBLAS_USE_ET
             m2 += m1;
             std::cout << "m2 += m1 = " << m2 << std::endl;
             m2 -= m1;
             std::cout << "m2 -= m1 = " << m2 << std::endl;
-#else
             m2 = m2 + m1;
-            std::cout << "m2 += m1 = " << m2 << std::endl;
+            std::cout << "m2 = m2 + m1 = " << m2 << std::endl;
             m2 = m2 - m1;
-            std::cout << "m2 -= m1 = " << m2 << std::endl;
-#endif
+            std::cout << "m2 = m2 - m1 = " << m2 << std::endl;
             m1 *= value_type (1.);
             std::cout << "m1 *= 1. = " << m1 << std::endl;
             m1 *= t;
diff --git a/test2/test2.cpp b/test2/test2.cpp
index 1b54ef66..2cd5b903 100644
--- a/test2/test2.cpp
+++ b/test2/test2.cpp
@@ -14,14 +14,6 @@
 //  GeNeSys mbH & Co. KG in producing this work.
 //
 
-#ifdef BOOST_MSVC
-
-#pragma warning (disable: 4355)
-#pragma warning (disable: 4503)
-#pragma warning (disable: 4786)
-
-#endif
-
 #include <iostream>
 
 #include <boost/numeric/ublas/config.hpp>
diff --git a/test2/test2.hpp b/test2/test2.hpp
index 6174eb56..f275641b 100644
--- a/test2/test2.hpp
+++ b/test2/test2.hpp
@@ -83,7 +83,8 @@ struct test_blas_3 {
 
 #define USE_FLOAT
 #define USE_DOUBLE
-#ifndef BOOST_MSVC
+// MSVC Version 6.0 & 7.0 have problems with std complex
+#if !defined(BOOST_MSVC) || (BOOST_MSVC > 1300)
 #define USE_STD_COMPLEX
 #endif
 
diff --git a/test2/test21.cpp b/test2/test21.cpp
index 4da556ab..e72f53f8 100644
--- a/test2/test21.cpp
+++ b/test2/test21.cpp
@@ -14,14 +14,6 @@
 //  GeNeSys mbH & Co. KG in producing this work.
 //
 
-#ifdef BOOST_MSVC
-
-#pragma warning (disable: 4355)
-#pragma warning (disable: 4503)
-#pragma warning (disable: 4786)
-
-#endif
-
 #include <iostream>
 
 #include <boost/numeric/ublas/config.hpp>
diff --git a/test2/test22.cpp b/test2/test22.cpp
index 4d317c35..3835fed6 100644
--- a/test2/test22.cpp
+++ b/test2/test22.cpp
@@ -14,14 +14,6 @@
 //  GeNeSys mbH & Co. KG in producing this work.
 //
 
-#ifdef BOOST_MSVC
-
-#pragma warning (disable: 4355)
-#pragma warning (disable: 4503)
-#pragma warning (disable: 4786)
-
-#endif
-
 #include <iostream>
 
 #include <boost/numeric/ublas/config.hpp>
diff --git a/test2/test23.cpp b/test2/test23.cpp
index 33f0f0da..6c7aaff4 100644
--- a/test2/test23.cpp
+++ b/test2/test23.cpp
@@ -14,14 +14,6 @@
 //  GeNeSys mbH & Co. KG in producing this work.
 //
 
-#ifdef BOOST_MSVC
-
-#pragma warning (disable: 4355)
-#pragma warning (disable: 4503)
-#pragma warning (disable: 4786)
-
-#endif
-
 #include <iostream>
 
 #include <boost/numeric/ublas/config.hpp>
diff --git a/test3/test3.cpp b/test3/test3.cpp
index dc6cd3de..304e142b 100644
--- a/test3/test3.cpp
+++ b/test3/test3.cpp
@@ -14,14 +14,6 @@
 //  GeNeSys mbH & Co. KG in producing this work.
 //
 
-#ifdef BOOST_MSVC
-
-#pragma warning (disable: 4355)
-#pragma warning (disable: 4503)
-#pragma warning (disable: 4786)
-
-#endif
-
 #include <iostream>
 
 #include <boost/numeric/ublas/config.hpp>
diff --git a/test3/test3.hpp b/test3/test3.hpp
index 829c1511..b37cffec 100644
--- a/test3/test3.hpp
+++ b/test3/test3.hpp
@@ -43,13 +43,14 @@ void test_matrix ();
 
 // #define USE_FLOAT
 #define USE_DOUBLE
-// #define USE_STD_COMPLEX
+#define USE_STD_COMPLEX
 
-// #define USE_RANGE
-// #define USE_SLICE
+//FIXME range and slice are failing
+//#define USE_RANGE
+//#define USE_SLICE
 
 #define USE_MAP_ARRAY
-// #define USE_STD_MAP
+#define USE_STD_MAP
 
 #define USE_SPARSE_VECTOR
 #define USE_COMPRESSED_VECTOR
diff --git a/test3/test31.cpp b/test3/test31.cpp
index a3f6eba4..c3b31444 100644
--- a/test3/test31.cpp
+++ b/test3/test31.cpp
@@ -14,14 +14,6 @@
 //  GeNeSys mbH & Co. KG in producing this work.
 //
 
-#ifdef BOOST_MSVC
-
-#pragma warning (disable: 4355)
-#pragma warning (disable: 4503)
-#pragma warning (disable: 4786)
-
-#endif
-
 #include <iostream>
 
 #include <boost/numeric/ublas/config.hpp>
@@ -90,17 +82,14 @@ struct test_my_vector {
             // Some assignments
             initialize_vector (v1);
             initialize_vector (v2);
-#ifdef BOOST_UBLAS_USE_ET
             v2 += v1;
             std::cout << "v2 += v1 = " << v2 << std::endl;
             v2 -= v1;
             std::cout << "v2 -= v1 = " << v2 << std::endl;
-#else
             v2 = v2 + v1;
-            std::cout << "v2 += v1 = " << v2 << std::endl;
+            std::cout << "v2 = v2 + v1 = " << v2 << std::endl;
             v2 = v2 - v1;
-            std::cout << "v2 -= v1 = " << v2 << std::endl;
-#endif
+            std::cout << "v2 = v2 - v1 = " << v2 << std::endl;
             v1 *= value_type (1.);
             std::cout << "v1 *= 1. = " << v1 << std::endl;
             v1 *= t;
diff --git a/test3/test32.cpp b/test3/test32.cpp
index d4eb706f..c8d2fa54 100644
--- a/test3/test32.cpp
+++ b/test3/test32.cpp
@@ -14,14 +14,6 @@
 //  GeNeSys mbH & Co. KG in producing this work.
 //
 
-#ifdef BOOST_MSVC
-
-#pragma warning (disable: 4355)
-#pragma warning (disable: 4503)
-#pragma warning (disable: 4786)
-
-#endif
-
 #include <iostream>
 
 #include <boost/numeric/ublas/config.hpp>
@@ -85,11 +77,13 @@ struct test_my_matrix_vector {
             ublas::matrix_column<M> mc1 (m1, 0), mc2 (m1, N - 1);
             (*this) (mc1, mc2, m1);
 
-#ifdef USE_RANGE_AND_SLICE
+#ifdef USE_RANGE
             ublas::matrix_vector_range<M> mvr1 (m1, ublas::range (0, N), ublas::range (0, N)),
                                           mvr2 (m1, ublas::range (0, N), ublas::range (0, N));
             (*this) (mvr1, mvr2, m1);
+#endif
 
+#ifdef USE_SLICE
             ublas::matrix_vector_slice<M> mvs1 (m1, ublas::slice (0, 1, N), ublas::slice (0, 1, N)),
                                           mvs2 (m1, ublas::slice (0, 1, N), ublas::slice (0, 1, N));
             (*this) (mvs1, mvs2, m1);
diff --git a/test3/test33.cpp b/test3/test33.cpp
index 8a74df12..f5d7a778 100644
--- a/test3/test33.cpp
+++ b/test3/test33.cpp
@@ -14,14 +14,6 @@
 //  GeNeSys mbH & Co. KG in producing this work.
 //
 
-#ifdef BOOST_MSVC
-
-#pragma warning (disable: 4355)
-#pragma warning (disable: 4503)
-#pragma warning (disable: 4786)
-
-#endif
-
 #include <iostream>
 
 #include <boost/numeric/ublas/config.hpp>
@@ -86,17 +78,14 @@ struct test_my_matrix {
             // Some assignments
             initialize_matrix (m1);
             initialize_matrix (m2);
-#ifdef BOOST_UBLAS_USE_ET
             m2 += m1;
             std::cout << "m2 += m1 = " << m2 << std::endl;
             m2 -= m1;
             std::cout << "m2 -= m1 = " << m2 << std::endl;
-#else
             m2 = m2 + m1;
-            std::cout << "m2 += m1 = " << m2 << std::endl;
+            std::cout << "m2 = m2 + m1 = " << m2 << std::endl;
             m2 = m2 - m1;
-            std::cout << "m2 -= m1 = " << m2 << std::endl;
-#endif
+            std::cout << "m2 = m2 - m1 = " << m2 << std::endl;
             m1 *= value_type (1.);
             std::cout << "m1 *= 1. = " << m1 << std::endl;
             m1 *= t;
diff --git a/test4/test4.cpp b/test4/test4.cpp
index ed72c8ee..82a6531d 100644
--- a/test4/test4.cpp
+++ b/test4/test4.cpp
@@ -14,14 +14,6 @@
 //  GeNeSys mbH & Co. KG in producing this work.
 //
 
-#ifdef BOOST_MSVC
-
-#pragma warning (disable: 4355)
-#pragma warning (disable: 4503)
-#pragma warning (disable: 4786)
-
-#endif
-
 #include <iostream>
 
 #include <boost/numeric/ublas/config.hpp>
diff --git a/test4/test4.hpp b/test4/test4.hpp
index 98d465db..569a298f 100644
--- a/test4/test4.hpp
+++ b/test4/test4.hpp
@@ -18,7 +18,7 @@
 #define TEST4_H
 
 #define USE_BANDED
-// #define USE_DIAGONAL
+//#define USE_DIAGONAL
 
 namespace ublas = boost::numeric::ublas;
 
@@ -51,10 +51,10 @@ void test_matrix ();
 
 // #define USE_FLOAT
 #define USE_DOUBLE
-// #define USE_STD_COMPLEX
+#define USE_STD_COMPLEX
 
-// #define USE_RANGE
-// #define USE_SLICE
+#define USE_RANGE
+#define USE_SLICE
 
 // #define USE_BOUNDED_ARRAY
 #define USE_UNBOUNDED_ARRAY
diff --git a/test4/test41.cpp b/test4/test41.cpp
index 370793d7..cbf3036c 100644
--- a/test4/test41.cpp
+++ b/test4/test41.cpp
@@ -14,14 +14,6 @@
 //  GeNeSys mbH & Co. KG in producing this work.
 //
 
-#ifdef BOOST_MSVC
-
-#pragma warning (disable: 4355)
-#pragma warning (disable: 4503)
-#pragma warning (disable: 4786)
-
-#endif
-
 #include <iostream>
 
 #include <boost/numeric/ublas/config.hpp>
@@ -88,17 +80,14 @@ struct test_my_vector {
             // Some assignments
             initialize_vector (v1);
             initialize_vector (v2);
-#ifdef BOOST_UBLAS_USE_ET
             v2 += v1;
             std::cout << "v2 += v1 = " << v2 << std::endl;
             v2 -= v1;
             std::cout << "v2 -= v1 = " << v2 << std::endl;
-#else
             v2 = v2 + v1;
-            std::cout << "v2 += v1 = " << v2 << std::endl;
+            std::cout << "v2 = v2 + v1 = " << v2 << std::endl;
             v2 = v2 - v1;
-            std::cout << "v2 -= v1 = " << v2 << std::endl;
-#endif
+            std::cout << "v2 = v2 - v1 = " << v2 << std::endl;
             v1 *= value_type (1.);
             std::cout << "v1 *= 1. = " << v1 << std::endl;
             v1 *= t;
diff --git a/test4/test42.cpp b/test4/test42.cpp
index aafc111d..1d57b2e2 100644
--- a/test4/test42.cpp
+++ b/test4/test42.cpp
@@ -14,14 +14,6 @@
 //  GeNeSys mbH & Co. KG in producing this work.
 //
 
-#ifdef BOOST_MSVC
-
-#pragma warning (disable: 4355)
-#pragma warning (disable: 4503)
-#pragma warning (disable: 4786)
-
-#endif
-
 #include <iostream>
 
 #include <boost/numeric/ublas/config.hpp>
@@ -91,11 +83,13 @@ struct test_my_matrix_vector {
             ublas::matrix_column<M> mc1 (m1, 1), mc2 (m1, 1);
             (*this) (mc1, mc2, m1);
 
-#ifdef USE_RANGE_AND_SLICE
+#ifdef USE_RANGE
             ublas::matrix_vector_range<M> mvr1 (m1, ublas::range (0, N), ublas::range (0, N)),
                                           mvr2 (m1, ublas::range (0, N), ublas::range (0, N));
             (*this) (mvr1, mvr2, m1);
+#endif
 
+#ifdef USE_SLICE
             ublas::matrix_vector_slice<M> mvs1 (m1, ublas::slice (0, 1, N), ublas::slice (0, 1, N)),
                                           mvs2 (m1, ublas::slice (0, 1, N), ublas::slice (0, 1, N));
             (*this) (mvs1, mvs2, m1);
@@ -123,11 +117,13 @@ struct test_my_matrix_vector {
             ublas::matrix_column<ublas::banded_adaptor<M> > mc1 (bam1, 1), mc2 (bam1, 1);
             (*this) (mc1, mc2, bam1);
 
-#ifdef USE_RANGE_AND_SLICE
+#ifdef USE_RANGE
             ublas::matrix_vector_range<ublas::banded_adaptor<M> > mvr1 (bam1, ublas::range (0, N), ublas::range (0, N)),
                                                                   mvr2 (bam1, ublas::range (0, N), ublas::range (0, N));
             (*this) (mvr1, mvr2, bam1);
+#endif
 
+#ifdef USE_SLICE
             ublas::matrix_vector_slice<ublas::banded_adaptor<M> > mvs1 (bam1, ublas::slice (0, 1, N), ublas::slice (0, 1, N)),
                                                                   mvs2 (bam1, ublas::slice (0, 1, N), ublas::slice (0, 1, N));
             (*this) (mvs1, mvs2, bam1);
@@ -145,11 +141,13 @@ struct test_my_matrix_vector {
             ublas::matrix_column<ublas::diagonal_adaptor<M> > mc1 (dam1, 1), mc2 (dam1, 1);
             (*this) (mc1, mc2, dam1);
 
-#ifdef USE_RANGE_AND_SLICE
+#ifdef USE_RANGE
             ublas::matrix_vector_range<ublas::diagonal_adaptor<M> > mvr1 (dam1, ublas::range (0, N), ublas::range (0, N)),
                                                                     mvr2 (dam1, ublas::range (0, N), ublas::range (0, N));
             (*this) (mvr1, mvr2, dam1);
+#endif
 
+#ifdef USE_SLICE
             ublas::matrix_vector_slice<ublas::diagonal_adaptor<M> > mvs1 (dam1, ublas::slice (0, 1, N), ublas::slice (0, 1, N)),
                                                                     mvs2 (dam1, ublas::slice (0, 1, N), ublas::slice (0, 1, N));
             (*this) (mvs1, mvs2, dam1);
diff --git a/test4/test43.cpp b/test4/test43.cpp
index 3c2adc96..77e09ae0 100644
--- a/test4/test43.cpp
+++ b/test4/test43.cpp
@@ -14,14 +14,6 @@
 //  GeNeSys mbH & Co. KG in producing this work.
 //
 
-#ifdef BOOST_MSVC
-
-#pragma warning (disable: 4355)
-#pragma warning (disable: 4503)
-#pragma warning (disable: 4786)
-
-#endif
-
 #include <iostream>
 
 #include <boost/numeric/ublas/config.hpp>
@@ -83,17 +75,14 @@ struct test_my_matrix {
             // Some assignments
             initialize_matrix (m1);
             initialize_matrix (m2);
-#ifdef BOOST_UBLAS_USE_ET
             m2 += m1;
             std::cout << "m2 += m1 = " << m2 << std::endl;
             m2 -= m1;
             std::cout << "m2 -= m1 = " << m2 << std::endl;
-#else
             m2 = m2 + m1;
-            std::cout << "m2 += m1 = " << m2 << std::endl;
+            std::cout << "m2 = m2 + m1 = " << m2 << std::endl;
             m2 = m2 - m1;
-            std::cout << "m2 -= m1 = " << m2 << std::endl;
-#endif
+            std::cout << "m2 = m2 - m1 = " << m2 << std::endl;
             m1 *= value_type (1.);
             std::cout << "m1 *= 1. = " << m1 << std::endl;
             m1 *= t;
diff --git a/test5/test5.cpp b/test5/test5.cpp
index a07f8140..0e460f15 100644
--- a/test5/test5.cpp
+++ b/test5/test5.cpp
@@ -14,14 +14,6 @@
 //  GeNeSys mbH & Co. KG in producing this work.
 //
 
-#ifdef BOOST_MSVC
-
-#pragma warning (disable: 4355)
-#pragma warning (disable: 4503)
-#pragma warning (disable: 4786)
-
-#endif
-
 #include <iostream>
 
 #include <boost/numeric/ublas/config.hpp>
diff --git a/test5/test5.hpp b/test5/test5.hpp
index 9ab10f15..844d96e2 100644
--- a/test5/test5.hpp
+++ b/test5/test5.hpp
@@ -68,10 +68,10 @@ void test_matrix ();
 
 // #define USE_FLOAT
 #define USE_DOUBLE
-// #define USE_STD_COMPLEX
+#define USE_STD_COMPLEX
 
-// #define USE_RANGE
-// #define USE_SLICE
+#define USE_RANGE
+#define USE_SLICE
 
 // #define USE_BOUNDED_ARRAY
 #define USE_UNBOUNDED_ARRAY
diff --git a/test5/test51.cpp b/test5/test51.cpp
index 1eff50d3..ed61e358 100644
--- a/test5/test51.cpp
+++ b/test5/test51.cpp
@@ -14,14 +14,6 @@
 //  GeNeSys mbH & Co. KG in producing this work.
 //
 
-#ifdef BOOST_MSVC
-
-#pragma warning (disable: 4355)
-#pragma warning (disable: 4503)
-#pragma warning (disable: 4786)
-
-#endif
-
 #include <iostream>
 
 #include <boost/numeric/ublas/config.hpp>
@@ -88,17 +80,14 @@ struct test_my_vector {
             // Some assignments
             initialize_vector (v1);
             initialize_vector (v2);
-#ifdef BOOST_UBLAS_USE_ET
             v2 += v1;
             std::cout << "v2 += v1 = " << v2 << std::endl;
             v2 -= v1;
             std::cout << "v2 -= v1 = " << v2 << std::endl;
-#else
             v2 = v2 + v1;
-            std::cout << "v2 += v1 = " << v2 << std::endl;
+            std::cout << "v2 = v2 + v1 = " << v2 << std::endl;
             v2 = v2 - v1;
-            std::cout << "v2 -= v1 = " << v2 << std::endl;
-#endif
+            std::cout << "v2 = v2 - v1 = " << v2 << std::endl;
             v1 *= value_type (1.);
             std::cout << "v1 *= 1. = " << v1 << std::endl;
             v1 *= t;
diff --git a/test5/test52.cpp b/test5/test52.cpp
index c32e828a..6fa8679f 100644
--- a/test5/test52.cpp
+++ b/test5/test52.cpp
@@ -14,14 +14,6 @@
 //  GeNeSys mbH & Co. KG in producing this work.
 //
 
-#ifdef BOOST_MSVC
-
-#pragma warning (disable: 4355)
-#pragma warning (disable: 4503)
-#pragma warning (disable: 4786)
-
-#endif
-
 #include <iostream>
 
 #include <boost/numeric/ublas/config.hpp>
@@ -84,11 +76,13 @@ struct test_my_matrix_vector {
             ublas::matrix_column<M> mc1 (m1, 0), mc2 (m1, 0);
             (*this) (mc1, mc2, m1);
 
-#ifdef USE_RANGE_AND_SLICE
+#ifdef USE_RANGE
             ublas::matrix_vector_range<M> mvr1 (m1, ublas::range (0, N), ublas::range (0, N)),
                                           mvr2 (m1, ublas::range (0, N), ublas::range (0, N));
             (*this) (mvr1, mvr2, m1);
+#endif
 
+#ifdef USE_SLICE
             ublas::matrix_vector_slice<M> mvs1 (m1, ublas::slice (0, 1, N), ublas::slice (0, 1, N)),
                                           mvs2 (m1, ublas::slice (0, 1, N), ublas::slice (0, 1, N));
             (*this) (mvs1, mvs2, m1);
@@ -115,11 +109,13 @@ struct test_my_matrix_vector {
             ublas::matrix_column<ublas::triangular_adaptor<M> > mc1 (tam1, 0), mc2 (tam1, 0);
             (*this) (mc1, mc2, tam1);
 
-#ifdef USE_RANGE_AND_SLICE
+#ifdef USE_RANGE
             ublas::matrix_vector_range<ublas::triangular_adaptor<M> > mvr1 (tam1, ublas::range (0, N), ublas::range (0, N)),
                                                                       mvr2 (tam1, ublas::range (0, N), ublas::range (0, N));
             (*this) (mvr1, mvr2, tam1);
+#endif
 
+#ifdef USE_SLICE
             ublas::matrix_vector_slice<ublas::triangular_adaptor<M> > mvs1 (tam1, ublas::slice (0, 1, N), ublas::slice (0, 1, N)),
                                                                       mvs2 (tam1, ublas::slice (0, 1, N), ublas::slice (0, 1, N));
             (*this) (mvs1, mvs2, tam1);
diff --git a/test5/test53.cpp b/test5/test53.cpp
index 40edf5f5..78afa1c2 100644
--- a/test5/test53.cpp
+++ b/test5/test53.cpp
@@ -14,14 +14,6 @@
 //  GeNeSys mbH & Co. KG in producing this work.
 //
 
-#ifdef BOOST_MSVC
-
-#pragma warning (disable: 4355)
-#pragma warning (disable: 4503)
-#pragma warning (disable: 4786)
-
-#endif
-
 #include <iostream>
 
 #include <boost/numeric/ublas/config.hpp>
@@ -83,17 +75,14 @@ struct test_my_matrix {
             // Some assignments
             initialize_matrix (m1, ublas::lower_tag ());
             initialize_matrix (m2, ublas::lower_tag ());
-#ifdef BOOST_UBLAS_USE_ET
             m2 += m1;
             std::cout << "m2 += m1 = " << m2 << std::endl;
             m2 -= m1;
             std::cout << "m2 -= m1 = " << m2 << std::endl;
-#else
             m2 = m2 + m1;
-            std::cout << "m2 += m1 = " << m2 << std::endl;
+            std::cout << "m2 = m2 + m1 = " << m2 << std::endl;
             m2 = m2 - m1;
-            std::cout << "m2 -= m1 = " << m2 << std::endl;
-#endif
+            std::cout << "m2 = m2 - m1 = " << m2 << std::endl;
             m1 *= value_type (1.);
             std::cout << "m1 *= 1. = " << m1 << std::endl;
             m1 *= t;
diff --git a/test6/test6.cpp b/test6/test6.cpp
index 8fa0737d..ef8b3a31 100644
--- a/test6/test6.cpp
+++ b/test6/test6.cpp
@@ -14,14 +14,6 @@
 //  GeNeSys mbH & Co. KG in producing this work.
 //
 
-#ifdef BOOST_MSVC
-
-#pragma warning (disable: 4355)
-#pragma warning (disable: 4503)
-#pragma warning (disable: 4786)
-
-#endif
-
 #include <iostream>
 
 #include <boost/numeric/ublas/config.hpp>
diff --git a/test6/test61.cpp b/test6/test61.cpp
index 2b6d8fca..5329cc57 100644
--- a/test6/test61.cpp
+++ b/test6/test61.cpp
@@ -14,14 +14,6 @@
 //  GeNeSys mbH & Co. KG in producing this work.
 //
 
-#ifdef BOOST_MSVC
-
-#pragma warning (disable: 4355)
-#pragma warning (disable: 4503)
-#pragma warning (disable: 4786)
-
-#endif
-
 #include <iostream>
 
 #include <boost/numeric/ublas/config.hpp>
@@ -89,17 +81,14 @@ struct test_my_vector {
             // Some assignments
             initialize_vector (v1);
             initialize_vector (v2);
-#ifdef BOOST_UBLAS_USE_ET
             v2 += v1;
             std::cout << "v2 += v1 = " << v2 << std::endl;
             v2 -= v1;
             std::cout << "v2 -= v1 = " << v2 << std::endl;
-#else
             v2 = v2 + v1;
-            std::cout << "v2 += v1 = " << v2 << std::endl;
+            std::cout << "v2 = v2 + v1 = " << v2 << std::endl;
             v2 = v2 - v1;
-            std::cout << "v2 -= v1 = " << v2 << std::endl;
-#endif
+            std::cout << "v2 = v2 - v1 = " << v2 << std::endl;
             v1 *= value_type (1.);
             std::cout << "v1 *= 1. = " << v1 << std::endl;
             v1 *= t;
diff --git a/test6/test62.cpp b/test6/test62.cpp
index 7bdcdd04..829e32aa 100644
--- a/test6/test62.cpp
+++ b/test6/test62.cpp
@@ -14,14 +14,6 @@
 //  GeNeSys mbH & Co. KG in producing this work.
 //
 
-#ifdef BOOST_MSVC
-
-#pragma warning (disable: 4355)
-#pragma warning (disable: 4503)
-#pragma warning (disable: 4786)
-
-#endif
-
 #include <iostream>
 
 #include <boost/numeric/ublas/config.hpp>
@@ -87,11 +79,13 @@ struct test_my_matrix_vector {
             ublas::matrix_column<M> mc1 (m1, 0), mc2 (m1, 0);
             (*this) (mc1, mc2, m1);
 
-#ifdef USE_RANGE_AND_SLICE
+#ifdef USE_RANGE
             ublas::matrix_vector_range<M> mvr1 (m1, ublas::range (0, N), ublas::range (0, N)),
                                           mvr2 (m1, ublas::range (0, N), ublas::range (0, N));
             (*this) (mvr1, mvr2, m1);
+#endif
 
+#ifdef USE_SLICE
             ublas::matrix_vector_slice<M> mvs1 (m1, ublas::slice (0, 1, N), ublas::slice (0, 1, N)),
                                           mvs2 (m1, ublas::slice (0, 1, N), ublas::slice (0, 1, N));
             (*this) (mvs1, mvs2, m1);
@@ -118,11 +112,13 @@ struct test_my_matrix_vector {
             ublas::matrix_column<ublas::symmetric_adaptor<M> > mc1 (tam1, 0), mc2 (tam1, 0);
             (*this) (mc1, mc2, tam1);
 
-#ifdef USE_RANGE_AND_SLICE
+#ifdef USE_RANGE
             ublas::matrix_vector_range<ublas::symmetric_adaptor<M> > mvr1 (tam1, ublas::range (0, N), ublas::range (0, N)),
                                                                      mvr2 (tam1, ublas::range (0, N), ublas::range (0, N));
             (*this) (mvr1, mvr2, tam1);
+#endif
 
+#ifdef USE_SLICE
             ublas::matrix_vector_slice<ublas::symmetric_adaptor<M> > mvs1 (tam1, ublas::slice (0, 1, N), ublas::slice (0, 1, N)),
                                                                      mvs2 (tam1, ublas::slice (0, 1, N), ublas::slice (0, 1, N));
             (*this) (mvs1, mvs2, tam1);
diff --git a/test6/test63.cpp b/test6/test63.cpp
index f5a1e74a..fa3a3464 100644
--- a/test6/test63.cpp
+++ b/test6/test63.cpp
@@ -14,14 +14,6 @@
 //  GeNeSys mbH & Co. KG in producing this work.
 //
 
-#ifdef BOOST_MSVC
-
-#pragma warning (disable: 4355)
-#pragma warning (disable: 4503)
-#pragma warning (disable: 4786)
-
-#endif
-
 #include <iostream>
 
 #include <boost/numeric/ublas/config.hpp>
@@ -84,17 +76,14 @@ struct test_my_matrix {
             // Some assignments
             initialize_matrix (m1, ublas::lower_tag ());
             initialize_matrix (m2, ublas::lower_tag ());
-#ifdef BOOST_UBLAS_USE_ET
             m2 += m1;
             std::cout << "m2 += m1 = " << m2 << std::endl;
             m2 -= m1;
             std::cout << "m2 -= m1 = " << m2 << std::endl;
-#else
             m2 = m2 + m1;
-            std::cout << "m2 += m1 = " << m2 << std::endl;
+            std::cout << "m2 = m2 + m1 = " << m2 << std::endl;
             m2 = m2 - m1;
-            std::cout << "m2 -= m1 = " << m2 << std::endl;
-#endif
+            std::cout << "m2 = m1 - m1 = " << m2 << std::endl;
             m1 *= value_type (1.);
             std::cout << "m1 *= 1. = " << m1 << std::endl;
             m1 *= t;
diff --git a/test7/test7.cpp b/test7/test7.cpp
index 7f797b83..165391a3 100644
--- a/test7/test7.cpp
+++ b/test7/test7.cpp
@@ -14,14 +14,6 @@
 //  GeNeSys mbH & Co. KG in producing this work.
 //
 
-#ifdef BOOST_MSVC
-
-#pragma warning (disable: 4355)
-#pragma warning (disable: 4503)
-#pragma warning (disable: 4786)
-
-#endif
-
 #include <iostream>
 
 #include <boost/numeric/interval.hpp>
diff --git a/test7/test7.hpp b/test7/test7.hpp
index 5a9d3f76..ba6f7c47 100644
--- a/test7/test7.hpp
+++ b/test7/test7.hpp
@@ -43,10 +43,10 @@ void test_matrix ();
 
 // #define USE_FLOAT
 #define USE_DOUBLE
-// #define USE_STD_COMPLEX
+#define USE_STD_COMPLEX
 
-// #define USE_RANGE
-// #define USE_SLICE
+#define USE_RANGE
+#define USE_SLICE
 
 // #define USE_BOUNDED_ARRAY
 #define USE_UNBOUNDED_ARRAY
diff --git a/test7/test71.cpp b/test7/test71.cpp
index 9321f184..d1832229 100644
--- a/test7/test71.cpp
+++ b/test7/test71.cpp
@@ -14,14 +14,6 @@
 //  GeNeSys mbH & Co. KG in producing this work.
 //
 
-#ifdef BOOST_MSVC
-
-#pragma warning (disable: 4355)
-#pragma warning (disable: 4503)
-#pragma warning (disable: 4786)
-
-#endif
-
 #include <iostream>
 
 #include <boost/numeric/interval.hpp>
@@ -90,17 +82,14 @@ struct test_my_vector {
             // Some assignments
             initialize_vector (v1);
             initialize_vector (v2);
-#ifdef BOOST_UBLAS_USE_ET
             v2 += v1;
             std::cout << "v2 += v1 = " << v2 << std::endl;
             v2 -= v1;
             std::cout << "v2 -= v1 = " << v2 << std::endl;
-#else
             v2 = v2 + v1;
-            std::cout << "v2 += v1 = " << v2 << std::endl;
+            std::cout << "v2 = v2 + v1 = " << v2 << std::endl;
             v2 = v2 - v1;
-            std::cout << "v2 -= v1 = " << v2 << std::endl;
-#endif
+            std::cout << "v2 = v2 - v1 = " << v2 << std::endl;
             v1 *= value_type (1.);
             std::cout << "v1 *= 1. = " << v1 << std::endl;
             v1 *= t;
diff --git a/test7/test72.cpp b/test7/test72.cpp
index cf369d4b..afd64983 100644
--- a/test7/test72.cpp
+++ b/test7/test72.cpp
@@ -14,14 +14,6 @@
 //  GeNeSys mbH & Co. KG in producing this work.
 //
 
-#ifdef BOOST_MSVC
-
-#pragma warning (disable: 4355)
-#pragma warning (disable: 4503)
-#pragma warning (disable: 4786)
-
-#endif
-
 #include <iostream>
 
 #include <boost/numeric/interval.hpp>
@@ -84,11 +76,13 @@ struct test_my_matrix_vector {
             ublas::matrix_column<M> mc1 (m1, 0), mc2 (m1, 1);
             (*this) (mc1, mc2, m1);
 
-#ifdef USE_RANGE_AND_SLICE
+#ifdef USE_RANGE
             ublas::matrix_vector_range<M> mvr1 (m1, ublas::range (0, N), ublas::range (0, N)),
                                           mvr2 (m1, ublas::range (0, N), ublas::range (0, N));
             (*this) (mvr1, mvr2, m1);
+#endif
 
+#ifdef USE_SLICE
             ublas::matrix_vector_slice<M> mvs1 (m1, ublas::slice (0, 1, N), ublas::slice (0, 1, N)),
                                           mvs2 (m1, ublas::slice (0, 1, N), ublas::slice (0, 1, N));
             (*this) (mvs1, mvs2, m1);
diff --git a/test7/test73.cpp b/test7/test73.cpp
index 97a01a45..688bbed6 100644
--- a/test7/test73.cpp
+++ b/test7/test73.cpp
@@ -14,14 +14,6 @@
 //  GeNeSys mbH & Co. KG in producing this work.
 //
 
-#ifdef BOOST_MSVC
-
-#pragma warning (disable: 4355)
-#pragma warning (disable: 4503)
-#pragma warning (disable: 4786)
-
-#endif
-
 #include <boost/numeric/interval.hpp>
 #include <boost/numeric/interval/io.hpp>
 
@@ -83,17 +75,14 @@ struct test_my_matrix {
             // Some assignments
             initialize_matrix (m1);
             initialize_matrix (m2);
-#ifdef BOOST_UBLAS_USE_ET
             m2 += m1;
             std::cout << "m2 += m1 = " << m2 << std::endl;
             m2 -= m1;
             std::cout << "m2 -= m1 = " << m2 << std::endl;
-#else
             m2 = m2 + m1;
-            std::cout << "m2 += m1 = " << m2 << std::endl;
+            std::cout << "m2 = m2 + m1 = " << m2 << std::endl;
             m2 = m2 - m1;
-            std::cout << "m2 -= m1 = " << m2 << std::endl;
-#endif
+            std::cout << "m2 = m1 - m1 = " << m2 << std::endl;
             m1 *= value_type (1.);
             std::cout << "m1 *= 1. = " << m1 << std::endl;
             m1 *= t;