1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
|
*** misc/boost-1.30.2/boost/bind.hpp 2002-10-15 12:51:34.000000000 +0200
--- misc/build/boost-1.30.2/boost/bind.hpp 2005-09-14 17:49:16.353411000 +0200
***************
*** 5,10 ****
--- 5,17 ----
#pragma once
#endif
+ #if defined(_MSC_VER) && !defined(BOOST_MEM_FN_ENABLE_CDECL)
+ // enable support for __cdecl (SAL_CALL) C++-UNO interface methods;
+ // makes sense to shift this to command line some day:
+ // -DBOOST_MEM_FN_ENABLE_CDECL
+ #define BOOST_MEM_FN_ENABLE_CDECL
+ #endif
+
//
// bind.hpp - binds function objects to arguments
//
***************
*** 1472,1477 ****
--- 1479,1496 ----
#undef BOOST_BIND_MF_NAME
#undef BOOST_BIND_MF_CC
+ #ifdef BOOST_MEM_FN_ENABLE_CDECL
+
+ #define BOOST_BIND_MF_NAME(X) X##_cdecl
+ #define BOOST_BIND_MF_CC __cdecl
+
+ #include <boost/bind/bind_mf_cc.hpp>
+
+ #undef BOOST_BIND_MF_NAME
+ #undef BOOST_BIND_MF_CC
+
+ #endif
+
#ifdef BOOST_MEM_FN_ENABLE_STDCALL
#define BOOST_BIND_MF_NAME(X) X##_stdcall
*** misc/boost-1.30.2/boost/function/function_template.hpp 2003-02-07 15:03:36.000000000 +0100
--- misc/build/boost-1.30.2/boost/function/function_template.hpp 2005-09-14 17:47:26.513096000 +0200
***************
*** 395,401 ****
invoker = 0;
}
! #if (defined __SUNPRO_CC) && (__SUNPRO_CC <= 0x530) && !(defined BOOST_NO_COMPILER_CONFIG)
// Sun C++ 5.3 can't handle the safe_bool idiom, so don't use it
operator bool () const { return !this->empty(); }
#else
--- 395,401 ----
invoker = 0;
}
! #if (defined __SUNPRO_CC) // workaround opt bug when compiling with -xO3
// Sun C++ 5.3 can't handle the safe_bool idiom, so don't use it
operator bool () const { return !this->empty(); }
#else
*** misc/boost-1.30.2/boost/mem_fn.hpp 2002-12-20 19:14:59.000000000 +0100
--- misc/build/boost-1.30.2/boost/mem_fn.hpp 2005-09-14 17:49:31.078044000 +0200
***************
*** 5,10 ****
--- 5,17 ----
#pragma once
#endif
+ #if defined(_MSC_VER) && !defined(BOOST_MEM_FN_ENABLE_CDECL)
+ // enable support for __cdecl (SAL_CALL) C++-UNO interface methods;
+ // makes sense to shift this to command line some day:
+ // -DBOOST_MEM_FN_ENABLE_CDECL
+ #define BOOST_MEM_FN_ENABLE_CDECL
+ #endif
+
//
// mem_fn.hpp - a generalization of std::mem_fun[_ref]
//
***************
*** 46,51 ****
--- 53,70 ----
#undef BOOST_MEM_FN_CC
#undef BOOST_MEM_FN_NAME
+ #ifdef BOOST_MEM_FN_ENABLE_CDECL
+
+ #define BOOST_MEM_FN_NAME(X) inner_##X##_cdecl
+ #define BOOST_MEM_FN_CC __cdecl
+
+ #include <boost/bind/mem_fn_template.hpp>
+
+ #undef BOOST_MEM_FN_CC
+ #undef BOOST_MEM_FN_NAME
+
+ #endif
+
#ifdef BOOST_MEM_FN_ENABLE_STDCALL
#define BOOST_MEM_FN_NAME(X) inner_##X##_stdcall
***************
*** 87,92 ****
--- 106,123 ----
#undef BOOST_MEM_FN_CC
#undef BOOST_MEM_FN_NAME
+ #ifdef BOOST_MEM_FN_ENABLE_CDECL
+
+ #define BOOST_MEM_FN_NAME(X) inner_##X##_cdecl
+ #define BOOST_MEM_FN_CC __cdecl
+
+ #include <boost/bind/mem_fn_template.hpp>
+
+ #undef BOOST_MEM_FN_CC
+ #undef BOOST_MEM_FN_NAME
+
+ #endif
+
#ifdef BOOST_MEM_FN_ENABLE_STDCALL
#define BOOST_MEM_FN_NAME(X) inner_##X##_stdcall
***************
*** 128,133 ****
--- 159,178 ----
#undef BOOST_MEM_FN_NAME2
#undef BOOST_MEM_FN_CC
+ #ifdef BOOST_MEM_FN_ENABLE_CDECL
+
+ #define BOOST_MEM_FN_NAME(X) X##_cdecl
+ #define BOOST_MEM_FN_NAME2(X) inner_##X##_cdecl
+ #define BOOST_MEM_FN_CC __cdecl
+
+ #include <boost/bind/mem_fn_vw.hpp>
+
+ #undef BOOST_MEM_FN_NAME
+ #undef BOOST_MEM_FN_NAME2
+ #undef BOOST_MEM_FN_CC
+
+ #endif
+
#ifdef BOOST_MEM_FN_ENABLE_STDCALL
#define BOOST_MEM_FN_NAME(X) X##_stdcall
***************
*** 176,181 ****
--- 221,238 ----
#undef BOOST_MEM_FN_CC
#undef BOOST_MEM_FN_NAME
+ #ifdef BOOST_MEM_FN_ENABLE_CDECL
+
+ #define BOOST_MEM_FN_NAME(X) X##_cdecl
+ #define BOOST_MEM_FN_CC __cdecl
+
+ #include <boost/bind/mem_fn_template.hpp>
+
+ #undef BOOST_MEM_FN_CC
+ #undef BOOST_MEM_FN_NAME
+
+ #endif
+
#ifdef BOOST_MEM_FN_ENABLE_STDCALL
#define BOOST_MEM_FN_NAME(X) X##_stdcall
***************
*** 217,222 ****
--- 274,291 ----
#undef BOOST_MEM_FN_NAME
#undef BOOST_MEM_FN_CC
+ #ifdef BOOST_MEM_FN_ENABLE_CDECL
+
+ #define BOOST_MEM_FN_NAME(X) X##_cdecl
+ #define BOOST_MEM_FN_CC __cdecl
+
+ #include <boost/bind/mem_fn_cc.hpp>
+
+ #undef BOOST_MEM_FN_NAME
+ #undef BOOST_MEM_FN_CC
+
+ #endif
+
#ifdef BOOST_MEM_FN_ENABLE_STDCALL
#define BOOST_MEM_FN_NAME(X) X##_stdcall
|
