VC6 bug workarounds

dabrahams · dabrahams · commit f59ed991fe46 · 2002-08-06T23:44:31.000Z
[SVN r14722]
diff --git a/src/dict.cpp b/src/dict.cpp
@@ -24,11 +24,11 @@ namespace
   }
 }
 
-BOOST_PYTHON_DECL detail::new_reference dict::call(object const& arg)
+BOOST_PYTHON_DECL detail::new_reference dict::call(object const& arg_)
 {
     return (detail::new_reference)PyObject_CallFunction(
         (PyObject*)&PyDict_Type, "(O)", 
-        arg.ptr());
+        arg_.ptr());
 }
 
 BOOST_PYTHON_DECL dict::dict()
diff --git a/src/list.cpp b/src/list.cpp
@@ -7,13 +7,13 @@
 
 namespace boost { namespace python { 
 
-BOOST_PYTHON_DECL detail::new_non_null_reference list::call(object const& arg)
+BOOST_PYTHON_DECL detail::new_non_null_reference list::call(object const& arg_)
 {
     return (detail::new_non_null_reference)
         (expect_non_null)(
             PyObject_CallFunction(
                 (PyObject*)&PyList_Type, "(O)", 
-                arg.ptr()));
+                arg_.ptr()));
 }
 
 BOOST_PYTHON_DECL list::list()
diff --git a/src/long.cpp b/src/long.cpp
@@ -7,18 +7,18 @@
 
 namespace boost { namespace python { 
 
-BOOST_PYTHON_DECL detail::new_non_null_reference long_::call(object const& arg)
+BOOST_PYTHON_DECL detail::new_non_null_reference long_::call(object const& arg_)
 {
     return (detail::new_non_null_reference)PyObject_CallFunction(
         (PyObject*)&PyLong_Type, "(O)", 
-        arg.ptr());
+        arg_.ptr());
 }
 
-BOOST_PYTHON_DECL detail::new_non_null_reference long_::call(object const& arg, object const& base)
+BOOST_PYTHON_DECL detail::new_non_null_reference long_::call(object const& arg_, object const& base)
 {
     return (detail::new_non_null_reference)PyObject_CallFunction(
         (PyObject*)&PyLong_Type, "(OO)", 
-        arg.ptr(), base.ptr());
+        arg_.ptr(), base.ptr());
 }
 
 BOOST_PYTHON_DECL long_::long_()
diff --git a/src/str.cpp b/src/str.cpp
@@ -3,11 +3,11 @@
 
 namespace boost { namespace python {
 
-BOOST_PYTHON_DECL detail::new_reference str::call(object const& arg)
+BOOST_PYTHON_DECL detail::new_reference str::call(object const& arg_)
 {
     return (detail::new_reference)PyObject_CallFunction(
         (PyObject*)&PyString_Type, "(O)", 
-        arg.ptr());
+        arg_.ptr());
 } 
 
 BOOST_PYTHON_DECL str::str(const char* s)
diff --git a/src/tuple.cpp b/src/tuple.cpp
@@ -2,11 +2,11 @@
 
 namespace boost { namespace python {
 
-BOOST_PYTHON_DECL detail::new_reference tuple::call(object const& arg)
+BOOST_PYTHON_DECL detail::new_reference tuple::call(object const& arg_)
 {
     return (detail::new_reference)PyObject_CallFunction(
         (PyObject*)&PyTuple_Type, "(O)", 
-        arg.ptr());
+        arg_.ptr());
 }
     
 BOOST_PYTHON_DECL tuple::tuple()

Original file line number	Diff line number	Diff line change
`@@ -24,11 +24,11 @@ namespace`
`24`	`24`	`}`
`25`	`25`	`}`
`26`	`26`
`27`		`-BOOST_PYTHON_DECL detail::new_reference dict::call(object const& arg)`
	`27`	`+BOOST_PYTHON_DECL detail::new_reference dict::call(object const& arg_)`
`28`	`28`	`{`
`29`	`29`	`return (detail::new_reference)PyObject_CallFunction(`
`30`	`30`	`(PyObject*)&PyDict_Type, "(O)",`
`31`		`- arg.ptr());`
	`31`	`+ arg_.ptr());`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`BOOST_PYTHON_DECL dict::dict()`
Original file line number	Diff line number	Diff line change
`@@ -7,13 +7,13 @@`
`7`	`7`
`8`	`8`	`namespace boost { namespace python {`
`9`	`9`
`10`		`-BOOST_PYTHON_DECL detail::new_non_null_reference list::call(object const& arg)`
	`10`	`+BOOST_PYTHON_DECL detail::new_non_null_reference list::call(object const& arg_)`
`11`	`11`	`{`
`12`	`12`	`return (detail::new_non_null_reference)`
`13`	`13`	`(expect_non_null)(`
`14`	`14`	`PyObject_CallFunction(`
`15`	`15`	`(PyObject*)&PyList_Type, "(O)",`
`16`		`- arg.ptr()));`
	`16`	`+ arg_.ptr()));`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`BOOST_PYTHON_DECL list::list()`
Original file line number	Diff line number	Diff line change
`@@ -7,18 +7,18 @@`
`7`	`7`
`8`	`8`	`namespace boost { namespace python {`
`9`	`9`
`10`		`-BOOST_PYTHON_DECL detail::new_non_null_reference long_::call(object const& arg)`
	`10`	`+BOOST_PYTHON_DECL detail::new_non_null_reference long_::call(object const& arg_)`
`11`	`11`	`{`
`12`	`12`	`return (detail::new_non_null_reference)PyObject_CallFunction(`
`13`	`13`	`(PyObject*)&PyLong_Type, "(O)",`
`14`		`- arg.ptr());`
	`14`	`+ arg_.ptr());`
`15`	`15`	`}`
`16`	`16`
`17`		`-BOOST_PYTHON_DECL detail::new_non_null_reference long_::call(object const& arg, object const& base)`
	`17`	`+BOOST_PYTHON_DECL detail::new_non_null_reference long_::call(object const& arg_, object const& base)`
`18`	`18`	`{`
`19`	`19`	`return (detail::new_non_null_reference)PyObject_CallFunction(`
`20`	`20`	`(PyObject*)&PyLong_Type, "(OO)",`
`21`		`- arg.ptr(), base.ptr());`
	`21`	`+ arg_.ptr(), base.ptr());`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`BOOST_PYTHON_DECL long_::long_()`
Original file line number	Diff line number	Diff line change
`@@ -3,11 +3,11 @@`
`3`	`3`
`4`	`4`	`namespace boost { namespace python {`
`5`	`5`
`6`		`-BOOST_PYTHON_DECL detail::new_reference str::call(object const& arg)`
	`6`	`+BOOST_PYTHON_DECL detail::new_reference str::call(object const& arg_)`
`7`	`7`	`{`
`8`	`8`	`return (detail::new_reference)PyObject_CallFunction(`
`9`	`9`	`(PyObject*)&PyString_Type, "(O)",`
`10`		`- arg.ptr());`
	`10`	`+ arg_.ptr());`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`BOOST_PYTHON_DECL str::str(const char* s)`
Original file line number	Diff line number	Diff line change
`@@ -2,11 +2,11 @@`
`2`	`2`
`3`	`3`	`namespace boost { namespace python {`
`4`	`4`
`5`		`-BOOST_PYTHON_DECL detail::new_reference tuple::call(object const& arg)`
	`5`	`+BOOST_PYTHON_DECL detail::new_reference tuple::call(object const& arg_)`
`6`	`6`	`{`
`7`	`7`	`return (detail::new_reference)PyObject_CallFunction(`
`8`	`8`	`(PyObject*)&PyTuple_Type, "(O)",`
`9`		`- arg.ptr());`
	`9`	`+ arg_.ptr());`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`BOOST_PYTHON_DECL tuple::tuple()`