From d72128107ee45312b23c18bb32b0b59ad3dcc7ab Mon Sep 17 00:00:00 2001
From: Dave Abrahams <dave@boostpro.com>
Date: Wed, 20 Mar 2002 07:16:06 +0000
Subject: [PATCH] no comment

[SVN r13231]
---
 include/boost/python/conversions.hpp          | 7 +++----
 include/boost/python/detail/init_function.hpp | 6 ++++++
 src/extension_class.cpp                       | 3 +--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/include/boost/python/conversions.hpp b/include/boost/python/conversions.hpp
index 24ac5614..f328981e 100644
--- a/include/boost/python/conversions.hpp
+++ b/include/boost/python/conversions.hpp
@@ -157,16 +157,15 @@ BOOST_PYTHON_DECL PyObject* to_python(unsigned char);
 BOOST_PYTHON_DECL unsigned char from_python(PyObject*, boost::python::type<unsigned char>);
 unsigned char from_python(PyObject*, boost::python::type<const unsigned char&>);
 
+BOOST_PYTHON_DECL float from_python(PyObject*, boost::python::type<float>);
+BOOST_PYTHON_DECL double from_python(PyObject*, boost::python::type<double>);
+
 # ifndef BOOST_MSVC6_OR_EARLIER
 PyObject* to_python(float);
-float from_python(PyObject*, boost::python::type<float>);
 PyObject* to_python(double);
-double from_python(PyObject*, boost::python::type<double>);
 # else
 BOOST_PYTHON_DECL PyObject* to_python(float);
-BOOST_PYTHON_DECL float from_python(PyObject*, boost::python::type<float>);
 BOOST_PYTHON_DECL PyObject* to_python(double);
-BOOST_PYTHON_DECL double from_python(PyObject*, boost::python::type<double>);
 # endif 
 float from_python(PyObject*, boost::python::type<const float&>);
     
diff --git a/include/boost/python/detail/init_function.hpp b/include/boost/python/detail/init_function.hpp
index 3c6f2380..048c90dd 100644
--- a/include/boost/python/detail/init_function.hpp
+++ b/include/boost/python/detail/init_function.hpp
@@ -168,6 +168,9 @@ template <class T, class A1, class A2, class A3, class A4, class A5, class A6, c
 template <class T>
 struct init_function
 {
+# ifdef BOOST_MSVC6_OR_EARLIER
+#  define typename
+# endif 
     static init* create(signature0) {
         return new init0<T>;
     }
@@ -276,6 +279,9 @@ struct init_function
                        typename detail::parameter_traits<A9>::const_reference,
                        typename detail::parameter_traits<A10>::const_reference>;
     }
+#ifdef BOOST_MSVC6_OR_EARLIER
+# undef typename
+#endif 
 };
 
 class BOOST_PYTHON_DECL init : public function
diff --git a/src/extension_class.cpp b/src/extension_class.cpp
index cc784ca6..98505347 100644
--- a/src/extension_class.cpp
+++ b/src/extension_class.cpp
@@ -11,7 +11,6 @@
 
 #define BOOST_PYTHON_SOURCE
 
-#include <boost/python/detail/extension_class.hpp>
 #include <boost/python/detail/extension_class.hpp>
 #include <boost/python/detail/call_object.hpp>
 #include <boost/utility.hpp>
@@ -178,7 +177,7 @@ extension_instance::~extension_instance()
     }
 }
     
-meta_class<extension_instance>* extension_meta_class()
+BOOST_PYTHON_DECL meta_class<extension_instance>* extension_meta_class()
 {
     static meta_class<extension_instance> result;
     return &result;