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
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
|
*** misc/boost-1.30.2/boost/bind.hpp Tue Oct 15 12:51:34 2002
--- misc/build/boost-1.30.2/boost/bind.hpp Thu Jan 26 17:10:47 2006
***************
*** 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 Fri Feb 7 15:03:36 2003
--- misc/build/boost-1.30.2/boost/function/function_template.hpp Wed Mar 8 20:10:22 2006
***************
*** 15,20 ****
--- 15,23 ----
// Note: this header is a header template and must NOT have multiple-inclusion
// protection.
+ #if defined __GNUC__
+ #pragma GCC system_header
+ #endif
#include <boost/function/detail/prologue.hpp>
#define BOOST_FUNCTION_TEMPLATE_PARMS BOOST_PP_ENUM_PARAMS(BOOST_FUNCTION_NUM_ARGS, typename T)
***************
*** 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
--- 398,404 ----
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
***************
*** 443,451 ****
R BOOST_FUNCTION_COMMA
BOOST_FUNCTION_TEMPLATE_ARGS
>::type
! invoker_type;
! invoker = &invoker_type::invoke;
function_base::manager =
&detail::function::functor_manager<FunctionPtr, Allocator>::manage;
function_base::functor =
--- 446,454 ----
R BOOST_FUNCTION_COMMA
BOOST_FUNCTION_TEMPLATE_ARGS
>::type
! lcl_invoker_type;
! invoker = &lcl_invoker_type::invoke;
function_base::manager =
&detail::function::functor_manager<FunctionPtr, Allocator>::manage;
function_base::functor =
***************
*** 476,491 ****
R BOOST_FUNCTION_COMMA
BOOST_FUNCTION_TEMPLATE_ARGS
>::type
! invoker_type;
! invoker = &invoker_type::invoke;
function_base::manager = &detail::function::functor_manager<
FunctionObj, Allocator>::manage;
#ifndef BOOST_NO_STD_ALLOCATOR
typedef typename Allocator::template rebind<FunctionObj>::other
! allocator_type;
! typedef typename allocator_type::pointer pointer_type;
! allocator_type allocator;
pointer_type copy = allocator.allocate(1);
allocator.construct(copy, f);
--- 479,494 ----
R BOOST_FUNCTION_COMMA
BOOST_FUNCTION_TEMPLATE_ARGS
>::type
! lcl_invoker_type;
! invoker = &lcl_invoker_type::invoke;
function_base::manager = &detail::function::functor_manager<
FunctionObj, Allocator>::manage;
#ifndef BOOST_NO_STD_ALLOCATOR
typedef typename Allocator::template rebind<FunctionObj>::other
! lcl_allocator_type;
! typedef typename lcl_allocator_type::pointer pointer_type;
! lcl_allocator_type allocator;
pointer_type copy = allocator.allocate(1);
allocator.construct(copy, f);
***************
*** 510,518 ****
R BOOST_FUNCTION_COMMA
BOOST_FUNCTION_TEMPLATE_ARGS
>::type
! invoker_type;
! invoker = &invoker_type::invoke;
function_base::manager = &detail::function::trivial_manager;
function_base::functor =
function_base::manager(
--- 513,521 ----
R BOOST_FUNCTION_COMMA
BOOST_FUNCTION_TEMPLATE_ARGS
>::type
! lcl_invoker_type;
! invoker = &lcl_invoker_type::invoke;
function_base::manager = &detail::function::trivial_manager;
function_base::functor =
function_base::manager(
***************
*** 532,539 ****
R BOOST_FUNCTION_COMMA
BOOST_FUNCTION_TEMPLATE_ARGS
>::type
! invoker_type;
! invoker = &invoker_type::invoke;
function_base::manager = &detail::function::trivial_manager;
function_base::functor = detail::function::make_any_pointer(this);
}
--- 535,542 ----
R BOOST_FUNCTION_COMMA
BOOST_FUNCTION_TEMPLATE_ARGS
>::type
! lcl_invoker_type;
! invoker = &lcl_invoker_type::invoke;
function_base::manager = &detail::function::trivial_manager;
function_base::functor = detail::function::make_any_pointer(this);
}
*** misc/boost-1.30.2/boost/function.hpp Fri Feb 14 16:34:39 2003
--- misc/build/boost-1.30.2/boost/function.hpp Thu Jan 26 17:10:47 2006
***************
*** 16,21 ****
--- 16,26 ----
// William Kempf, Jesse Jones and Karl Nelson were all very helpful in the
// design of this library.
+ #if defined _MSC_VER
+ #pragma warning(push)
+ #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro"
+ #endif
+
#include <boost/preprocessor/iterate.hpp>
#include <boost/detail/workaround.hpp>
***************
*** 68,70 ****
--- 73,79 ----
# include BOOST_PP_ITERATE()
# undef BOOST_PP_ITERATION_PARAMS_1
#endif
+
+ #if defined _MSC_VER
+ #pragma warning(pop)
+ #endif
*** misc/boost-1.30.2/boost/mem_fn.hpp Fri Dec 20 19:14:59 2002
--- misc/build/boost-1.30.2/boost/mem_fn.hpp Thu Jan 26 17:10:47 2006
***************
*** 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
|
