Skip to content

Commit 6505978

Browse files
committed
upgraded cxx
svn path=/trunk/matplotlib/; revision=1070
1 parent 0c9ae88 commit 6505978

12 files changed

+239
-110
lines changed

CHANGELOG

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
New entries should be added at the top
22

3+
2005-03-11 Upgraded CXX to 5.3.1
4+
35
2005-03-10 remove GraphicsContextPS.set_linestyle()
46
and GraphicsContextSVG.set_linestyle() since they do no more than
57
the base class GraphicsContext.set_linestyle() - SC

CXX/Config.hxx

+5-9
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,13 @@
66
//
77
#if defined( _MSC_VER )
88

9-
# if _MSC_VER <= 1200
10-
# define STANDARD_LIBRARY_HAS_ITERATOR_TRAITS 0
11-
# else
12-
# define STANDARD_LIBRARY_HAS_ITERATOR_TRAITS 1
13-
# endif
9+
# define STANDARD_LIBRARY_HAS_ITERATOR_TRAITS 1
1410

1511
#elif defined( __GNUC__ )
1612
# if __GNUC__ >= 3
17-
# define STANDARD_LIBRARY_HAS_ITERATOR_TRAITS 0
18-
# else
1913
# define STANDARD_LIBRARY_HAS_ITERATOR_TRAITS 1
14+
# else
15+
# define STANDARD_LIBRARY_HAS_ITERATOR_TRAITS 0
2016
#endif
2117

2218
//
@@ -29,9 +25,9 @@
2925
#endif
3026

3127
#if STANDARD_LIBRARY_HAS_ITERATOR_TRAITS
32-
# define random_access_iterator_parent(itemtype) std::random_access_iterator<itemtype, int>
33-
#else
3428
# define random_access_iterator_parent(itemtype) std::iterator<std::random_access_iterator_tag,itemtype,int>
29+
#else
30+
# define random_access_iterator_parent(itemtype) std::random_access_iterator<itemtype, int>
3531
#endif
3632

3733
//

CXX/IndirectPythonInterface.cxx

+2-2
Original file line numberDiff line numberDiff line change
@@ -195,9 +195,9 @@ static char **GetCharPointer_as_CharPointerPointer( const char *name )
195195

196196

197197
#ifdef _DEBUG
198-
static const char *python_dll_name_format = "PYTHON%1.1d%1.1d_D.DLL";
198+
static const char python_dll_name_format[] = "PYTHON%1.1d%1.1d_D.DLL";
199199
#else
200-
static const char *python_dll_name_format = "PYTHON%1.1d%1.1d.DLL";
200+
static const char python_dll_name_format[] = "PYTHON%1.1d%1.1d.DLL";
201201
#endif
202202

203203
//--------------------------------------------------------------------------------

CXX/IndirectPythonInterface.hxx

+3-3
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,6 @@ PyObject * _None();
5959
//
6060
// Wrap Type variables as function calls
6161
//
62-
PyTypeObject * _String_Type();
63-
bool _String_Check( PyObject *o );
64-
6562
PyTypeObject * _List_Type();
6663
bool _List_Check( PyObject *o );
6764

@@ -125,6 +122,9 @@ bool _Slice_Check( PyObject *op );
125122
PyTypeObject * _String_Type();
126123
bool _String_Check( PyObject *op );
127124

125+
PyTypeObject * _Unicode_Type();
126+
bool _Unicode_Check( PyObject *op );
127+
128128
PyTypeObject * _TraceBack_Type();
129129
bool _TraceBack_Check( PyObject *v );
130130

0 commit comments

Comments
 (0)