upgraded cxx

svn path=/trunk/matplotlib/; revision=1070
piannucci · Mar 11, 2005 · 6505978 · 6505978
1 parent 0c9ae88
commit 6505978
Show file tree

Hide file tree

Showing 12 changed files with 239 additions and 110 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,7 @@
 New entries should be added at the top
 
+2005-03-11 Upgraded CXX to 5.3.1
+
 2005-03-10 remove GraphicsContextPS.set_linestyle()
 	   and GraphicsContextSVG.set_linestyle() since they do no more than 
            the base class GraphicsContext.set_linestyle() - SC

diff --git a/CXX/Config.hxx b/CXX/Config.hxx
@@ -6,17 +6,13 @@
 //
 #if defined( _MSC_VER )
 
-#  if _MSC_VER <= 1200
-#    define STANDARD_LIBRARY_HAS_ITERATOR_TRAITS 0
-#  else
-#    define STANDARD_LIBRARY_HAS_ITERATOR_TRAITS 1
-#  endif
+#  define STANDARD_LIBRARY_HAS_ITERATOR_TRAITS 1
 
 #elif defined( __GNUC__ )
 #  if __GNUC__ >= 3
-#    define STANDARD_LIBRARY_HAS_ITERATOR_TRAITS 0
-#  else
 #    define STANDARD_LIBRARY_HAS_ITERATOR_TRAITS 1
+#  else
+#    define STANDARD_LIBRARY_HAS_ITERATOR_TRAITS 0
 #endif
 
 //
@@ -29,9 +25,9 @@
 #endif
 
 #if STANDARD_LIBRARY_HAS_ITERATOR_TRAITS
-#  define random_access_iterator_parent(itemtype) std::random_access_iterator<itemtype, int>
-#else
 #  define random_access_iterator_parent(itemtype) std::iterator<std::random_access_iterator_tag,itemtype,int>
+#else
+#  define random_access_iterator_parent(itemtype) std::random_access_iterator<itemtype, int>
 #endif
 
 //

diff --git a/CXX/IndirectPythonInterface.cxx b/CXX/IndirectPythonInterface.cxx
@@ -195,9 +195,9 @@ static char **GetCharPointer_as_CharPointerPointer( const char *name )
 
 
 #ifdef _DEBUG
-static const char *python_dll_name_format = "PYTHON%1.1d%1.1d_D.DLL";
+static const char python_dll_name_format[] = "PYTHON%1.1d%1.1d_D.DLL";
 #else
-static const char *python_dll_name_format = "PYTHON%1.1d%1.1d.DLL";
+static const char python_dll_name_format[] = "PYTHON%1.1d%1.1d.DLL";
 #endif
 
 //--------------------------------------------------------------------------------

diff --git a/CXX/IndirectPythonInterface.hxx b/CXX/IndirectPythonInterface.hxx
@@ -59,9 +59,6 @@ PyObject * _None();
 //
 //	Wrap Type variables as function calls
 //
-PyTypeObject * _String_Type();
-bool _String_Check( PyObject *o );
-
 PyTypeObject * _List_Type();
 bool _List_Check( PyObject *o );
 
@@ -125,6 +122,9 @@ bool _Slice_Check( PyObject *op );
 PyTypeObject * _String_Type();
 bool _String_Check( PyObject *op );
 
+PyTypeObject * _Unicode_Type();
+bool _Unicode_Check( PyObject *op );
+
 PyTypeObject * _TraceBack_Type();
 bool _TraceBack_Check( PyObject *v );