Skip to content

Commit 5923e20

Browse files
dabrahamsdabrahams
committed
Roll back MinGW 2.0 "fix" that still doesn't work, and breaks MSVC6.
[SVN r15313]
1 parent 14cca46 commit 5923e20

File tree

5 files changed

+108
-108
lines changed

5 files changed

+108
-108
lines changed

‎include/boost/python/dict.hpp‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@
88

99
namespace boost { namespace python {
1010

11-
class BOOST_PYTHON_DECL dict : public object
11+
class dict : public object
1212
{
1313
public:
1414
// dict() -> new empty dictionary.
1515
// dict(mapping) -> new dictionary initialized from a mapping object's
1616
// (key, value) pairs.
1717
// dict(seq) -> new dictionary initialized as if via:
18-
dict(); // new dict
19-
explicit dict(object_cref data);
18+
BOOST_PYTHON_DECL dict(); // new dict
19+
explicit BOOST_PYTHON_DECL dict(object_cref data);
2020

2121
template <class T>
2222
explicit dict(T const& data)
@@ -25,21 +25,21 @@ class BOOST_PYTHON_DECL dict : public object
2525
}
2626

2727
// D.clear() -> None. Remove all items from D.
28-
void clear();
28+
BOOST_PYTHON_DECL void clear();
2929

3030
// D.copy() -> a shallow copy of D
31-
dict copy();
31+
BOOST_PYTHON_DECL dict copy();
3232

3333
// D.get(k[,d]) -> D[k] if D.has_key(k), else d. d defaults to None.
34-
object get(object_cref k) const;
34+
BOOST_PYTHON_DECL object get(object_cref k) const;
3535

3636
template<class T>
3737
object get(T const& k) const
3838
{
3939
return this->get(object(k));
4040
}
4141

42-
object get(object_cref k, object_cref d) const;
42+
BOOST_PYTHON_DECL object get(object_cref k, object_cref d) const;
4343

4444
template<class T1, class T2>
4545
object get(T1 const& k, T2 const& d) const
@@ -48,7 +48,7 @@ class BOOST_PYTHON_DECL dict : public object
4848
}
4949

5050
// D.has_key(k) -> 1 if D has a key k, else 0
51-
bool has_key(object_cref k) const;
51+
BOOST_PYTHON_DECL bool has_key(object_cref k) const;
5252

5353
template<class T>
5454
bool has_key(T const& k) const
@@ -57,34 +57,34 @@ class BOOST_PYTHON_DECL dict : public object
5757
}
5858

5959
// D.items() -> list of D's (key, value) pairs, as 2-tuples
60-
list items() const;
60+
BOOST_PYTHON_DECL list items() const;
6161

6262
// D.iteritems() -> an iterator over the (key, value) items of D
63-
object iteritems() const;
63+
BOOST_PYTHON_DECL object iteritems() const;
6464

6565
// D.iterkeys() -> an iterator over the keys of D
66-
object iterkeys() const;
66+
BOOST_PYTHON_DECL object iterkeys() const;
6767

6868
// D.itervalues() -> an iterator over the values of D
69-
object itervalues() const;
69+
BOOST_PYTHON_DECL object itervalues() const;
7070

7171
// D.keys() -> list of D's keys
72-
list keys() const;
72+
BOOST_PYTHON_DECL list keys() const;
7373

7474
// D.popitem() -> (k, v), remove and return some (key, value) pair as a
7575
// 2-tuple; but raise KeyError if D is empty
76-
tuple popitem();
76+
BOOST_PYTHON_DECL tuple popitem();
7777

7878
// D.setdefault(k[,d]) -> D.get(k,d), also set D[k]=d if not D.has_key(k)
79-
object setdefault(object_cref k);
79+
BOOST_PYTHON_DECL object setdefault(object_cref k);
8080

8181
template<class T>
8282
object setdefault(T const& k)
8383
{
8484
return this->setdefault(object(k));
8585
}
8686

87-
object setdefault(object_cref k, object_cref d);
87+
BOOST_PYTHON_DECL object setdefault(object_cref k, object_cref d);
8888

8989
template<class T1, class T2>
9090
object setdefault(T1 const& k, T2 const& d)
@@ -93,7 +93,7 @@ class BOOST_PYTHON_DECL dict : public object
9393
}
9494

9595
// D.update(E) -> None. Update D from E: for k in E.keys(): D[k] = E[k]
96-
void update(object_cref E);
96+
BOOST_PYTHON_DECL void update(object_cref E);
9797

9898
template<class T>
9999
void update(T const& E)
@@ -102,13 +102,13 @@ class BOOST_PYTHON_DECL dict : public object
102102
}
103103

104104
// D.values() -> list of D's values
105-
list values() const;
105+
BOOST_PYTHON_DECL list values() const;
106106

107107
public: // implementation detail -- for internal use only
108108
BOOST_PYTHON_FORWARD_OBJECT_CONSTRUCTORS(dict)
109109

110110
private:
111-
static detail::new_reference call(object const&);
111+
static BOOST_PYTHON_DECL detail::new_reference call(object const&);
112112
};
113113

114114

‎include/boost/python/list.hpp‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11,52 +11,52 @@
1111

1212
namespace boost { namespace python {
1313

14-
class BOOST_PYTHON_DECL list : public object
14+
class list : public object
1515
{
1616
public:
17-
list(); // new list
18-
explicit list(object_cref sequence); // new list initialized from sequence's items
17+
BOOST_PYTHON_DECL list(); // new list
18+
explicit BOOST_PYTHON_DECL list(object_cref sequence); // new list initialized from sequence's items
1919

2020
template <class T>
2121
explicit list(T const& sequence)
2222
: object(list::call(object(sequence)))
2323
{
2424
}
2525

26-
void append(object_cref); // append object to end
26+
BOOST_PYTHON_DECL void append(object_cref); // append object to end
2727

2828
template <class T>
2929
void append(T const& x)
3030
{
3131
this->append(object(x));
3232
}
3333

34-
long count(object_cref value) const; // return number of occurrences of value
34+
BOOST_PYTHON_DECL long count(object_cref value) const; // return number of occurrences of value
3535

3636
template <class T>
3737
long count(T const& value) const
3838
{
3939
return this->count(object(value));
4040
}
4141

42-
void extend(object_cref sequence); // extend list by appending sequence elements
42+
BOOST_PYTHON_DECL void extend(object_cref sequence); // extend list by appending sequence elements
4343

4444
template <class T>
4545
void extend(T const& x)
4646
{
4747
this->extend(object(x));
4848
}
4949

50-
long index(object_cref value) const; // return index of first occurrence of value
50+
BOOST_PYTHON_DECL long index(object_cref value) const; // return index of first occurrence of value
5151

5252
template <class T>
5353
long index(T const& x) const
5454
{
5555
return this->index(object(x));
5656
}
5757

58-
void insert(int index, object_cref); // insert object before index
59-
void insert(object const& index, object_cref);
58+
BOOST_PYTHON_DECL void insert(int index, object_cref); // insert object before index
59+
BOOST_PYTHON_DECL void insert(object const& index, object_cref);
6060

6161
template <class T>
6262
void insert(int index, T const& x) // insert object before index
@@ -70,22 +70,22 @@ class BOOST_PYTHON_DECL list : public object
7070
this->insert(index, object(x));
7171
}
7272

73-
object pop(); // remove and return item at index (default last)
74-
object pop(long index);
75-
object pop(object const& index);
73+
BOOST_PYTHON_DECL object pop(); // remove and return item at index (default last)
74+
BOOST_PYTHON_DECL object pop(long index);
75+
BOOST_PYTHON_DECL object pop(object const& index);
7676

77-
void remove(object_cref value); // remove first occurrence of value
77+
BOOST_PYTHON_DECL void remove(object_cref value); // remove first occurrence of value
7878

7979
template <class T>
8080
void remove(T const& value)
8181
{
8282
this->remove(object(value));
8383
}
8484

85-
void reverse(); // reverse *IN PLACE*
85+
BOOST_PYTHON_DECL void reverse(); // reverse *IN PLACE*
8686

87-
void sort(); // sort *IN PLACE*; if given, cmpfunc(x, y) -> -1, 0, 1
88-
void sort(object_cref cmpfunc);
87+
BOOST_PYTHON_DECL void sort(); // sort *IN PLACE*; if given, cmpfunc(x, y) -> -1, 0, 1
88+
BOOST_PYTHON_DECL void sort(object_cref cmpfunc);
8989

9090
template <class T>
9191
void sort(T const& value)
@@ -97,7 +97,7 @@ class BOOST_PYTHON_DECL list : public object
9797
BOOST_PYTHON_FORWARD_OBJECT_CONSTRUCTORS(list)
9898

9999
private:
100-
static detail::new_non_null_reference call(object const&);
100+
static BOOST_PYTHON_DECL detail::new_non_null_reference call(object const&);
101101
};
102102

103103
//

‎include/boost/python/long.hpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,19 @@
1111

1212
namespace boost { namespace python {
1313

14-
class BOOST_PYTHON_DECL long_ : public object
14+
class long_ : public object
1515
{
1616
public:
17-
long_(); // new long_
18-
explicit long_(object_cref rhs);
17+
BOOST_PYTHON_DECL long_(); // new long_
18+
explicit BOOST_PYTHON_DECL long_(object_cref rhs);
1919

2020
template <class T>
2121
explicit long_(T const& rhs)
2222
: object(long_::call(object(rhs)))
2323
{
2424
}
2525

26-
explicit long_(object_cref rhs, object_cref base);
26+
explicit BOOST_PYTHON_DECL long_(object_cref rhs, object_cref base);
2727

2828
template <class T, class U>
2929
explicit long_(T const& rhs, U const& base)
@@ -34,8 +34,8 @@ class BOOST_PYTHON_DECL long_ : public object
3434
BOOST_PYTHON_FORWARD_OBJECT_CONSTRUCTORS(long_)
3535

3636
private:
37-
static detail::new_non_null_reference call(object const&);
38-
static detail::new_non_null_reference call(object const&, object const&);
37+
static BOOST_PYTHON_DECL detail::new_non_null_reference call(object const&);
38+
static BOOST_PYTHON_DECL detail::new_non_null_reference call(object const&, object const&);
3939
};
4040

4141
//

0 commit comments

Comments
 (0)