1 Index: /trunk/boost/python/call.hpp
\r
2 ===================================================================
\r
3 --- /trunk/boost/python/call.hpp (revision 24055)
\r
4 +++ /trunk/boost/python/call.hpp (revision 48960)
\r
6 # endif // CALL_DWA2002411_HPP
\r
8 -#elif BOOST_PP_ITERATION_DEPTH() == 1
\r
9 +// For gcc 4.4 compatability, we must include the
\r
10 +// BOOST_PP_ITERATION_DEPTH test inside an #else clause.
\r
11 +#else // BOOST_PP_IS_ITERATING
\r
12 +#if BOOST_PP_ITERATION_DEPTH() == 1
\r
13 # if !(BOOST_WORKAROUND(__MWERKS__, > 0x3100) \
\r
14 && BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3201)))
\r
18 +#endif // BOOST_PP_ITERATION_DEPTH()
\r
20 Index: /trunk/boost/python/object/value_holder.hpp
\r
21 ===================================================================
\r
22 --- /trunk/boost/python/object/value_holder.hpp (revision 32284)
\r
23 +++ /trunk/boost/python/object/value_holder.hpp (revision 48960)
\r
25 // --------------- value_holder ---------------
\r
27 -#elif BOOST_PP_ITERATION_DEPTH() == 1 && BOOST_PP_ITERATION_FLAGS() == 1
\r
28 +// For gcc 4.4 compatability, we must include the
\r
29 +// BOOST_PP_ITERATION_DEPTH test inside an #else clause.
\r
30 +#else // BOOST_PP_IS_ITERATING
\r
31 +#if BOOST_PP_ITERATION_DEPTH() == 1 && BOOST_PP_ITERATION_FLAGS() == 1
\r
32 # if !(BOOST_WORKAROUND(__MWERKS__, > 0x3100) \
\r
33 && BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3201)))
\r
37 +#endif // BOOST_PP_ITERATION_DEPTH()
\r
39 Index: /trunk/boost/python/object/make_holder.hpp
\r
40 ===================================================================
\r
41 --- /trunk/boost/python/object/make_holder.hpp (revision 39191)
\r
42 +++ /trunk/boost/python/object/make_holder.hpp (revision 48960)
\r
44 # endif // MAKE_HOLDER_DWA20011215_HPP
\r
46 -#elif BOOST_PP_ITERATION_DEPTH() == 1
\r
47 +// For gcc 4.4 compatability, we must include the
\r
48 +// BOOST_PP_ITERATION_DEPTH test inside an #else clause.
\r
49 +#else // BOOST_PP_IS_ITERATING
\r
50 +#if BOOST_PP_ITERATION_DEPTH() == 1
\r
51 # if !(BOOST_WORKAROUND(__MWERKS__, > 0x3100) \
\r
52 && BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3201)))
\r
56 +#endif // BOOST_PP_ITERATION_DEPTH()
\r
58 Index: /trunk/boost/python/object/pointer_holder.hpp
\r
59 ===================================================================
\r
60 --- /trunk/boost/python/object/pointer_holder.hpp (revision 41521)
\r
61 +++ /trunk/boost/python/object/pointer_holder.hpp (revision 48960)
\r
64 /* --------------- pointer_holder --------------- */
\r
65 -#elif BOOST_PP_ITERATION_DEPTH() == 1 && BOOST_PP_ITERATION_FLAGS() == 1
\r
66 +// For gcc 4.4 compatability, we must include the
\r
67 +// BOOST_PP_ITERATION_DEPTH test inside an #else clause.
\r
68 +#else // BOOST_PP_IS_ITERATING
\r
69 +#if BOOST_PP_ITERATION_DEPTH() == 1 && BOOST_PP_ITERATION_FLAGS() == 1
\r
70 # if !(BOOST_WORKAROUND(__MWERKS__, > 0x3100) \
\r
71 && BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3201)))
\r
75 +#endif // BOOST_PP_ITERATION_DEPTH()
\r
77 Index: /trunk/boost/python/call_method.hpp
\r
78 ===================================================================
\r
79 --- /trunk/boost/python/call_method.hpp (revision 24614)
\r
80 +++ /trunk/boost/python/call_method.hpp (revision 48960)
\r
82 # endif // CALL_METHOD_DWA2002411_HPP
\r
84 -#elif BOOST_PP_ITERATION_DEPTH() == 1
\r
85 +// For gcc 4.4 compatability, we must include the
\r
86 +// BOOST_PP_ITERATION_DEPTH test inside an #else clause.
\r
87 +#else // BOOST_PP_IS_ITERATING
\r
88 +#if BOOST_PP_ITERATION_DEPTH() == 1
\r
89 # if !(BOOST_WORKAROUND(__MWERKS__, > 0x3100) \
\r
90 && BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3201)))
\r
94 +#endif // BOOST_PP_ITERATION_DEPTH()
\r
95 #endif // BOOST_PP_IS_ITERATING
\r
96 Index: /trunk/boost/python/detail/target.hpp
\r
97 ===================================================================
\r
98 --- /trunk/boost/python/detail/target.hpp (revision 24614)
\r
99 +++ /trunk/boost/python/detail/target.hpp (revision 48960)
\r
102 /* --------------- function pointers --------------- */
\r
103 -#elif BOOST_PP_ITERATION_DEPTH() == 1 && BOOST_PP_ITERATION_FLAGS() == BOOST_PYTHON_FUNCTION_POINTER
\r
104 +// For gcc 4.4 compatability, we must include the
\r
105 +// BOOST_PP_ITERATION_DEPTH test inside an #else clause.
\r
106 +#else // BOOST_PP_IS_ITERATING
\r
107 +#if BOOST_PP_ITERATION_DEPTH() == 1 && BOOST_PP_ITERATION_FLAGS() == BOOST_PYTHON_FUNCTION_POINTER
\r
108 # if !(BOOST_WORKAROUND(__MWERKS__, > 0x3100) \
\r
109 && BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3201)))
\r
113 +#endif // BOOST_PP_ITERATION_DEPTH()
\r
115 Index: /trunk/boost/python/detail/result.hpp
\r
116 ===================================================================
\r
117 --- /trunk/boost/python/detail/result.hpp (revision 43799)
\r
118 +++ /trunk/boost/python/detail/result.hpp (revision 48960)
\r
121 /* --------------- function pointers --------------- */
\r
122 -#elif BOOST_PP_ITERATION_DEPTH() == 1 && BOOST_PP_ITERATION_FLAGS() == BOOST_PYTHON_FUNCTION_POINTER
\r
123 +// For gcc 4.4 compatability, we must include the
\r
124 +// BOOST_PP_ITERATION_DEPTH test inside an #else clause.
\r
125 +#else // BOOST_PP_IS_ITERATING
\r
126 +#if BOOST_PP_ITERATION_DEPTH() == 1 && BOOST_PP_ITERATION_FLAGS() == BOOST_PYTHON_FUNCTION_POINTER
\r
127 # if !(BOOST_WORKAROUND(__MWERKS__, > 0x3100) \
\r
128 && BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3201)))
\r
129 @@ -129,3 +132,4 @@
\r
132 +#endif // BOOST_PP_ITERATION_DEPTH()
\r
134 Index: /trunk/boost/python/signature.hpp
\r
135 ===================================================================
\r
136 --- /trunk/boost/python/signature.hpp (revision 24055)
\r
137 +++ /trunk/boost/python/signature.hpp (revision 48960)
\r
138 @@ -114,5 +114,8 @@
\r
139 # endif // SIGNATURE_JDG20020813_HPP
\r
141 -#elif BOOST_PP_ITERATION_DEPTH() == 1 // defined(BOOST_PP_IS_ITERATING)
\r
142 +// For gcc 4.4 compatability, we must include the
\r
143 +// BOOST_PP_ITERATION_DEPTH test inside an #else clause.
\r
144 +#else // BOOST_PP_IS_ITERATING
\r
145 +#if BOOST_PP_ITERATION_DEPTH() == 1 // defined(BOOST_PP_IS_ITERATING)
\r
147 # define N BOOST_PP_ITERATION()
\r
148 @@ -177,3 +180,4 @@
\r
151 +#endif // BOOST_PP_ITERATION_DEPTH()
\r
152 #endif // !defined(BOOST_PP_IS_ITERATING)
\r
153 Index: /trunk/boost/mpl/aux_/numeric_op.hpp
\r
154 ===================================================================
\r
155 --- /trunk/boost/mpl/aux_/numeric_op.hpp (revision 30670)
\r
156 +++ /trunk/boost/mpl/aux_/numeric_op.hpp (revision 48960)
\r
157 @@ -288,5 +288,8 @@
\r
158 ///// iteration, depth == 1
\r
160 -#elif BOOST_PP_ITERATION_DEPTH() == 1
\r
161 +// For gcc 4.4 compatability, we must include the
\r
162 +// BOOST_PP_ITERATION_DEPTH test inside an #else clause.
\r
163 +#else // BOOST_PP_IS_ITERATING
\r
164 +#if BOOST_PP_ITERATION_DEPTH() == 1
\r
166 # define i_ BOOST_PP_FRAME_ITERATION(1)
\r
167 @@ -309,3 +312,4 @@
\r
170 +#endif // BOOST_PP_ITERATION_DEPTH()
\r
171 #endif // BOOST_PP_IS_ITERATING
\r
172 Index: /trunk/boost/mpl/aux_/advance_backward.hpp
\r
173 ===================================================================
\r
174 --- /trunk/boost/mpl/aux_/advance_backward.hpp (revision 24874)
\r
175 +++ /trunk/boost/mpl/aux_/advance_backward.hpp (revision 48960)
\r
177 ///// iteration, depth == 1
\r
179 -#elif BOOST_PP_ITERATION_DEPTH() == 1
\r
180 +// For gcc 4.4 compatability, we must include the
\r
181 +// BOOST_PP_ITERATION_DEPTH test inside an #else clause.
\r
182 +#else // BOOST_PP_IS_ITERATING
\r
183 +#if BOOST_PP_ITERATION_DEPTH() == 1
\r
184 #define i_ BOOST_PP_FRAME_ITERATION(1)
\r
186 @@ -122,3 +125,4 @@
\r
187 # undef AUX778076_ITER_0
\r
189 +#endif // BOOST_PP_ITERATION_DEPTH()
\r
190 #endif // BOOST_PP_IS_ITERATING
\r
191 Index: /trunk/boost/mpl/aux_/full_lambda.hpp
\r
192 ===================================================================
\r
193 --- /trunk/boost/mpl/aux_/full_lambda.hpp (revision 24896)
\r
194 +++ /trunk/boost/mpl/aux_/full_lambda.hpp (revision 48960)
\r
195 @@ -228,5 +228,8 @@
\r
196 ///// iteration, depth == 1
\r
198 -#elif BOOST_PP_ITERATION_DEPTH() == 1
\r
199 +// For gcc 4.4 compatability, we must include the
\r
200 +// BOOST_PP_ITERATION_DEPTH test inside an #else clause.
\r
201 +#else // BOOST_PP_IS_ITERATING
\r
202 +#if BOOST_PP_ITERATION_DEPTH() == 1
\r
203 #define i_ BOOST_PP_FRAME_ITERATION(1)
\r
205 @@ -348,3 +351,4 @@
\r
208 +#endif // BOOST_PP_ITERATION_DEPTH()
\r
209 #endif // BOOST_PP_IS_ITERATING
\r
210 Index: /trunk/boost/mpl/aux_/advance_forward.hpp
\r
211 ===================================================================
\r
212 --- /trunk/boost/mpl/aux_/advance_forward.hpp (revision 24874)
\r
213 +++ /trunk/boost/mpl/aux_/advance_forward.hpp (revision 48960)
\r
215 ///// iteration, depth == 1
\r
217 -#elif BOOST_PP_ITERATION_DEPTH() == 1
\r
218 +// For gcc 4.4 compatability, we must include the
\r
219 +// BOOST_PP_ITERATION_DEPTH test inside an #else clause.
\r
220 +#else // BOOST_PP_IS_ITERATING
\r
221 +#if BOOST_PP_ITERATION_DEPTH() == 1
\r
222 #define i_ BOOST_PP_FRAME_ITERATION(1)
\r
224 @@ -121,3 +124,4 @@
\r
225 # undef AUX778076_ITER_0
\r
227 +#endif // BOOST_PP_ITERATION_DEPTH()
\r
228 #endif // BOOST_PP_IS_ITERATING
\r
229 Index: /trunk/boost/mpl/unpack_args.hpp
\r
230 ===================================================================
\r
231 --- /trunk/boost/mpl/unpack_args.hpp (revision 24874)
\r
232 +++ /trunk/boost/mpl/unpack_args.hpp (revision 48960)
\r
233 @@ -112,5 +112,8 @@
\r
234 ///// iteration, depth == 1
\r
236 -#elif BOOST_PP_ITERATION_DEPTH() == 1
\r
237 +// For gcc 4.4 compatability, we must include the
\r
238 +// BOOST_PP_ITERATION_DEPTH test inside an #else clause.
\r
239 +#else // BOOST_PP_IS_ITERATING
\r
240 +#if BOOST_PP_ITERATION_DEPTH() == 1
\r
242 # define i_ BOOST_PP_FRAME_ITERATION(1)
\r
243 @@ -144,3 +147,4 @@
\r
246 +#endif // BOOST_PP_ITERATION_DEPTH()
\r
247 #endif // BOOST_PP_IS_ITERATING
\r
248 Index: /trunk/boost/mpl/bind.hpp
\r
249 ===================================================================
\r
250 --- /trunk/boost/mpl/bind.hpp (revision 25875)
\r
251 +++ /trunk/boost/mpl/bind.hpp (revision 48960)
\r
252 @@ -362,5 +362,8 @@
\r
253 ///// iteration, depth == 1
\r
255 -#elif BOOST_PP_ITERATION_DEPTH() == 1
\r
256 +// For gcc 4.4 compatability, we must include the
\r
257 +// BOOST_PP_ITERATION_DEPTH test inside an #else clause.
\r
258 +#else // BOOST_PP_IS_ITERATING
\r
259 +#if BOOST_PP_ITERATION_DEPTH() == 1
\r
261 # define i_ BOOST_PP_FRAME_ITERATION(1)
\r
262 @@ -545,3 +548,4 @@
\r
265 +#endif // BOOST_PP_ITERATION_DEPTH()
\r
266 #endif // BOOST_PP_IS_ITERATING
\r
267 Index: /trunk/boost/mpl/apply.hpp
\r
268 ===================================================================
\r
269 --- /trunk/boost/mpl/apply.hpp (revision 24874)
\r
270 +++ /trunk/boost/mpl/apply.hpp (revision 48960)
\r
271 @@ -136,5 +136,8 @@
\r
272 ///// iteration, depth == 1
\r
274 -#elif BOOST_PP_ITERATION_DEPTH() == 1
\r
275 +// For gcc 4.4 compatability, we must include the
\r
276 +// BOOST_PP_ITERATION_DEPTH test inside an #else clause.
\r
277 +#else // BOOST_PP_IS_ITERATING
\r
278 +#if BOOST_PP_ITERATION_DEPTH() == 1
\r
280 # define i_ BOOST_PP_FRAME_ITERATION(1)
\r
281 @@ -223,3 +226,4 @@
\r
284 +#endif // BOOST_PP_ITERATION_DEPTH()
\r
285 #endif // BOOST_PP_IS_ITERATING
\r
286 Index: /trunk/boost/mpl/apply_wrap.hpp
\r
287 ===================================================================
\r
288 --- /trunk/boost/mpl/apply_wrap.hpp (revision 24892)
\r
289 +++ /trunk/boost/mpl/apply_wrap.hpp (revision 48960)
\r
291 ///// iteration, depth == 1
\r
293 -#elif BOOST_PP_ITERATION_DEPTH() == 1
\r
294 +// For gcc 4.4 compatability, we must include the
\r
295 +// BOOST_PP_ITERATION_DEPTH test inside an #else clause.
\r
296 +#else // BOOST_PP_IS_ITERATING
\r
297 +#if BOOST_PP_ITERATION_DEPTH() == 1
\r
299 # define i_ BOOST_PP_FRAME_ITERATION(1)
\r
300 @@ -198,3 +201,4 @@
\r
303 +#endif // BOOST_PP_ITERATION_DEPTH()
\r
304 #endif // BOOST_PP_IS_ITERATING
\r