From 2213cf98c68dcd4c86914e99c3e4aac89bf0a25c Mon Sep 17 00:00:00 2001
From: Dave Abrahams <dave@boostpro.com>
Date: Mon, 24 Mar 2008 18:27:22 +0000
Subject: [PATCH] Work around vc9 bugs

[SVN r43845]
---
 test/args.cpp    |  2 +-
 test/numpy.cpp   | 29 +++++++++++++----------------
 test/pickle3.cpp |  2 +-
 test/slice.cpp   |  2 +-
 4 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/test/args.cpp b/test/args.cpp
index 238a471e..592a8e50 100644
--- a/test/args.cpp
+++ b/test/args.cpp
@@ -14,7 +14,7 @@
 
 using namespace boost::python;
 
-#if BOOST_WORKAROUND(__SUNPRO_CC, BOOST_TESTED_AT(0x580))
+#if BOOST_WORKAROUND(__SUNPRO_CC, BOOST_TESTED_AT(0x580)) || BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1500))
 # define make_tuple boost::python::make_tuple
 #endif 
 
diff --git a/test/numpy.cpp b/test/numpy.cpp
index 59eb5266..9472f92e 100644
--- a/test/numpy.cpp
+++ b/test/numpy.cpp
@@ -10,19 +10,16 @@
 #include <boost/python/str.hpp>
 
 using namespace boost::python;
-
-#if BOOST_WORKAROUND(__SUNPRO_CC, BOOST_TESTED_AT(0x580))
-# define make_tuple ::boost::python::make_tuple
-#endif 
+namespace py = boost::python;
 
 // See if we can invoke array() from C++
 numeric::array new_array()
 {
     return numeric::array(
-        make_tuple(
-            make_tuple(1,2,3)
-          , make_tuple(4,5,6)
-          , make_tuple(7,8,9)
+        py::make_tuple(
+            py::make_tuple(1,2,3)
+          , py::make_tuple(4,5,6)
+          , py::make_tuple(7,8,9)
             )
         );
 }
@@ -51,7 +48,7 @@ namespace
       str format("exception type: %sn");                                 
       format += "exception value: %sn";                                  
       format += "traceback:n%s" ;                                        
-      object ret = format % make_tuple(ty, v, tr);
+      object ret = format % py::make_tuple(ty, v, tr);
       return ret;
   }
 }
@@ -71,7 +68,7 @@ namespace
 // inherits that behavior from object.
 void exercise(numeric::array& y, object check)
 {
-    y[make_tuple(2,1)] = 3;
+    y[py::make_tuple(2,1)] = 3;
     CHECK(y);
     CHECK(y.astype('D'));
     CHECK(y.copy());
@@ -116,12 +113,12 @@ void exercise_numarray(numeric::array& y, object check)
     CHECK(y);
     CHECK(y.type());
 
-    CHECK(y.factory(make_tuple(1.2, 3.4)));
-    CHECK(y.factory(make_tuple(1.2, 3.4), "f8"));
-    CHECK(y.factory(make_tuple(1.2, 3.4), "f8", true));
-    CHECK(y.factory(make_tuple(1.2, 3.4), "f8", true, false));
-    CHECK(y.factory(make_tuple(1.2, 3.4), "f8", true, false, object()));
-    CHECK (y.factory(make_tuple(1.2, 3.4), "f8", true, false, object(), make_tuple(1,2,1)));
+    CHECK(y.factory(py::make_tuple(1.2, 3.4)));
+    CHECK(y.factory(py::make_tuple(1.2, 3.4), "f8"));
+    CHECK(y.factory(py::make_tuple(1.2, 3.4), "f8", true));
+    CHECK(y.factory(py::make_tuple(1.2, 3.4), "f8", true, false));
+    CHECK(y.factory(py::make_tuple(1.2, 3.4), "f8", true, false, object()));
+    CHECK (y.factory(py::make_tuple(1.2, 3.4), "f8", true, false, object(), py::make_tuple(1,2,1)));
 
 }
 
diff --git a/test/pickle3.cpp b/test/pickle3.cpp
index 7aaddc9a..14b0dbdd 100644
--- a/test/pickle3.cpp
+++ b/test/pickle3.cpp
@@ -25,7 +25,7 @@
 #include <boost/python/extract.hpp>
 #include <boost/python/back_reference.hpp>
 
-#if BOOST_WORKAROUND(__SUNPRO_CC, BOOST_TESTED_AT(0x580))
+#if BOOST_WORKAROUND(__SUNPRO_CC, BOOST_TESTED_AT(0x580)) || BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1500))
 # define make_tuple boost::python::make_tuple
 #endif 
 
diff --git a/test/slice.cpp b/test/slice.cpp
index 03953e39..032bf7cf 100644
--- a/test/slice.cpp
+++ b/test/slice.cpp
@@ -10,7 +10,7 @@
 
 using namespace boost::python;
 
-#if BOOST_WORKAROUND(__SUNPRO_CC, BOOST_TESTED_AT(0x580))
+#if BOOST_WORKAROUND(__SUNPRO_CC, BOOST_TESTED_AT(0x580)) || BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1500))
 # define make_tuple boost::python::make_tuple
 #endif