]>
Commit | Line | Data |
---|---|---|
628bad78 JR |
1 | --- cppu/source/uno/assign.hxx.orig 2006-01-16 13:55:04.464641775 +0100 |
2 | +++ cppu/source/uno/assign.hxx 2006-01-16 13:55:27.213233090 +0100 | |
3 | @@ -50,7 +50,7 @@ | |
4 | ||
5 | ||
6 | //-------------------------------------------------------------------------------------------------- | |
7 | -inline void _assignInterface( | |
8 | +__inline__ __attribute__((always_inline)) void _assignInterface( | |
9 | void ** ppDest, void * pSource, | |
10 | uno_AcquireFunc acquire, uno_ReleaseFunc release ) | |
11 | SAL_THROW( () ) | |
12 | @@ -60,7 +60,7 @@ | |
13 | *ppDest = pSource; | |
14 | } | |
15 | //-------------------------------------------------------------------------------------------------- | |
16 | -inline void * _queryInterface( | |
17 | +__inline__ __attribute__((always_inline)) void * _queryInterface( | |
18 | void * pSource, | |
19 | typelib_TypeDescriptionReference * pDestType, | |
20 | uno_QueryInterfaceFunc queryInterface ) | |
21 | @@ -81,7 +81,7 @@ | |
22 | uno_QueryInterfaceFunc queryInterface, uno_AcquireFunc acquire, uno_ReleaseFunc release ) | |
23 | SAL_THROW( () ); | |
24 | //-------------------------------------------------------------------------------------------------- | |
25 | -inline sal_Bool _assignStruct( | |
26 | +__inline__ __attribute__((always_inline)) sal_Bool _assignStruct( | |
27 | void * pDest, void * pSource, | |
28 | typelib_CompoundTypeDescription * pTypeDescr, | |
29 | uno_QueryInterfaceFunc queryInterface, uno_AcquireFunc acquire, uno_ReleaseFunc release ) | |
30 | @@ -114,7 +114,7 @@ | |
31 | return sal_True; | |
32 | } | |
33 | //-------------------------------------------------------------------------------------------------- | |
34 | -inline sal_Bool _assignArray( | |
35 | +__inline__ __attribute__((always_inline)) sal_Bool _assignArray( | |
36 | void * pDest, void * pSource, | |
37 | typelib_ArrayTypeDescription * pTypeDescr, | |
38 | uno_QueryInterfaceFunc queryInterface, uno_AcquireFunc acquire, uno_ReleaseFunc release ) | |
39 | @@ -237,7 +237,7 @@ | |
40 | return bRet; | |
41 | } | |
42 | //-------------------------------------------------------------------------------------------------- | |
43 | -inline sal_Bool _assignData( | |
44 | +__inline__ __attribute__((always_inline)) sal_Bool _assignData( | |
45 | void * pDest, | |
46 | typelib_TypeDescriptionReference * pDestType, typelib_TypeDescription * pDestTypeDescr, | |
47 | void * pSource, | |
48 | --- cppu/source/uno/constr.hxx.orig 2005-09-08 10:50:56.000000000 +0200 | |
49 | +++ cppu/source/uno/constr.hxx 2006-01-16 13:53:47.953833046 +0100 | |
50 | @@ -46,7 +46,7 @@ | |
51 | //################################################################################################## | |
52 | ||
53 | //-------------------------------------------------------------------------------------------------- | |
54 | -inline void _defaultConstructUnion( | |
55 | +__inline__ __attribute__((always_inline)) void _defaultConstructUnion( | |
56 | void * pMem, | |
57 | typelib_TypeDescription * pTypeDescr ) | |
58 | SAL_THROW( () ) | |
59 | @@ -62,7 +62,7 @@ | |
60 | typelib_CompoundTypeDescription * pCompType ) | |
61 | SAL_THROW( () ); | |
62 | //-------------------------------------------------------------------------------------------------- | |
63 | -inline void _defaultConstructStruct( | |
64 | +__inline__ __attribute__((always_inline)) void _defaultConstructStruct( | |
65 | void * pMem, | |
66 | typelib_CompoundTypeDescription * pTypeDescr ) | |
67 | SAL_THROW( () ) | |
68 | @@ -83,7 +83,7 @@ | |
69 | } | |
70 | ||
71 | //-------------------------------------------------------------------------------------------------- | |
72 | -inline void _defaultConstructArray( | |
73 | +__inline__ __attribute__((always_inline)) void _defaultConstructArray( | |
74 | void * pMem, | |
75 | typelib_ArrayTypeDescription * pTypeDescr ) | |
76 | { | |
77 | @@ -164,7 +164,7 @@ | |
78 | } | |
79 | ||
80 | //-------------------------------------------------------------------------------------------------- | |
81 | -inline void _defaultConstructData( | |
82 | +__inline__ __attribute__((always_inline)) void _defaultConstructData( | |
83 | void * pMem, | |
84 | typelib_TypeDescriptionReference * pType, | |
85 | typelib_TypeDescription * pTypeDescr ) | |
86 | --- cppu/source/uno/copy.hxx.orig 2005-09-08 10:51:21.000000000 +0200 | |
87 | +++ cppu/source/uno/copy.hxx 2006-01-16 13:54:50.840880957 +0100 | |
88 | @@ -47,7 +47,7 @@ | |
89 | //################################################################################################## | |
90 | ||
91 | //------------------------------------------------------------------------------ | |
92 | -inline uno_Sequence * allocSeq( | |
93 | +__inline__ __attribute__((always_inline)) uno_Sequence * allocSeq( | |
94 | sal_Int32 nElementSize, sal_Int32 nElements ) | |
95 | { | |
96 | OSL_ASSERT( nElements >= 0 && nElementSize >= 0 ); | |
97 | @@ -73,7 +73,7 @@ | |
98 | uno_AcquireFunc acquire, uno_Mapping * mapping ) | |
99 | SAL_THROW ( () ); | |
100 | //-------------------------------------------------------------------------------------------------- | |
101 | -inline void _copyConstructStruct( | |
102 | +__inline__ __attribute__((always_inline)) void _copyConstructStruct( | |
103 | void * pDest, void * pSource, | |
104 | typelib_CompoundTypeDescription * pTypeDescr, | |
105 | uno_AcquireFunc acquire, uno_Mapping * mapping ) | |
106 | @@ -112,7 +112,7 @@ | |
107 | } | |
108 | } | |
109 | //-------------------------------------------------------------------------------------------------- | |
110 | -inline void _copyConstructArray( | |
111 | +__inline__ __attribute__((always_inline)) void _copyConstructArray( | |
112 | void * pDest, void * pSource, | |
113 | typelib_ArrayTypeDescription * pTypeDescr, | |
114 | uno_AcquireFunc acquire, uno_Mapping * mapping ) | |
115 | @@ -146,7 +146,7 @@ | |
116 | } | |
117 | } | |
118 | //-------------------------------------------------------------------------------------------------- | |
119 | -inline void _copyConstructUnion( | |
120 | +__inline__ __attribute__((always_inline)) void _copyConstructUnion( | |
121 | void * pDest, void * pSource, | |
122 | typelib_TypeDescription * pTypeDescr, | |
123 | uno_AcquireFunc acquire, uno_Mapping * mapping ) | |
124 | @@ -178,7 +178,7 @@ | |
125 | uno_AcquireFunc acquire, uno_Mapping * mapping ); | |
126 | ||
127 | //-------------------------------------------------------------------------------------------------- | |
128 | -inline void _copyConstructAnyFromData( | |
129 | +__inline__ __attribute__((always_inline)) void _copyConstructAnyFromData( | |
130 | uno_Any * pDestAny, void * pSource, | |
131 | typelib_TypeDescriptionReference * pType, typelib_TypeDescription * pTypeDescr, | |
132 | uno_AcquireFunc acquire, uno_Mapping * mapping ) | |
133 | @@ -357,7 +357,7 @@ | |
134 | } | |
135 | } | |
136 | //-------------------------------------------------------------------------------------------------- | |
137 | -inline void _copyConstructAny( | |
138 | +__inline__ __attribute__((always_inline)) void _copyConstructAny( | |
139 | uno_Any * pDestAny, void * pSource, | |
140 | typelib_TypeDescriptionReference * pType, typelib_TypeDescription * pTypeDescr, | |
141 | uno_AcquireFunc acquire, uno_Mapping * mapping ) | |
142 | @@ -542,7 +542,7 @@ | |
143 | } | |
144 | } | |
145 | //------------------------------------------------------------------------------ | |
146 | -inline uno_Sequence * icopyConstructSequence( | |
147 | +__inline__ __attribute__((always_inline)) uno_Sequence * icopyConstructSequence( | |
148 | uno_Sequence * pSource, | |
149 | typelib_TypeDescriptionReference * pElementType, | |
150 | uno_AcquireFunc acquire, uno_Mapping * mapping ) | |
151 | @@ -751,7 +751,7 @@ | |
152 | } | |
153 | ||
154 | //-------------------------------------------------------------------------------------------------- | |
155 | -inline void _copyConstructData( | |
156 | +__inline__ __attribute__((always_inline)) void _copyConstructData( | |
157 | void * pDest, void * pSource, | |
158 | typelib_TypeDescriptionReference * pType, typelib_TypeDescription * pTypeDescr, | |
159 | uno_AcquireFunc acquire, uno_Mapping * mapping ) | |
160 | --- cppu/source/uno/destr.hxx.orig 2006-01-16 13:55:47.521404651 +0100 | |
161 | +++ cppu/source/uno/destr.hxx 2006-01-16 13:56:16.955406494 +0100 | |
162 | @@ -46,7 +46,7 @@ | |
163 | //################################################################################################## | |
164 | ||
165 | //-------------------------------------------------------------------------------------------------- | |
166 | -inline void _destructUnion( | |
167 | +__inline__ __attribute__((always_inline)) void _destructUnion( | |
168 | void * pValue, | |
169 | typelib_TypeDescription * pTypeDescr, | |
170 | uno_ReleaseFunc release ) | |
171 | @@ -65,7 +65,7 @@ | |
172 | uno_ReleaseFunc release ) | |
173 | SAL_THROW( () ); | |
174 | //-------------------------------------------------------------------------------------------------- | |
175 | -inline void _destructStruct( | |
176 | +__inline__ __attribute__((always_inline)) void _destructStruct( | |
177 | void * pValue, | |
178 | typelib_CompoundTypeDescription * pTypeDescr, | |
179 | uno_ReleaseFunc release ) | |
180 | @@ -88,7 +88,7 @@ | |
181 | } | |
182 | ||
183 | //-------------------------------------------------------------------------------------------------- | |
184 | -inline void _destructArray( | |
185 | +__inline__ __attribute__((always_inline)) void _destructArray( | |
186 | void * pValue, | |
187 | typelib_ArrayTypeDescription * pTypeDescr, | |
188 | uno_ReleaseFunc release ) | |
189 | @@ -118,7 +118,7 @@ | |
190 | uno_ReleaseFunc release ); | |
191 | ||
192 | //-------------------------------------------------------------------------------------------------- | |
193 | -inline void _destructAny( | |
194 | +__inline__ __attribute__((always_inline)) void _destructAny( | |
195 | uno_Any * pAny, | |
196 | uno_ReleaseFunc release ) | |
197 | SAL_THROW( () ) | |
198 | @@ -197,7 +197,7 @@ | |
199 | ::typelib_typedescriptionreference_release( pType ); | |
200 | } | |
201 | //-------------------------------------------------------------------------------------------------- | |
202 | -inline sal_Int32 idestructElements( | |
203 | +__inline__ __attribute__((always_inline)) sal_Int32 idestructElements( | |
204 | void * pElements, typelib_TypeDescriptionReference * pElementType, | |
205 | sal_Int32 nStartIndex, sal_Int32 nStopIndex, | |
206 | uno_ReleaseFunc release ) | |
207 | @@ -339,7 +339,7 @@ | |
208 | } | |
209 | ||
210 | //------------------------------------------------------------------------------ | |
211 | -inline void idestructSequence( | |
212 | +__inline__ __attribute__((always_inline)) void idestructSequence( | |
213 | uno_Sequence * pSeq, | |
214 | typelib_TypeDescriptionReference * pType, | |
215 | typelib_TypeDescription * pTypeDescr, | |
216 | @@ -371,7 +371,7 @@ | |
217 | } | |
218 | ||
219 | //-------------------------------------------------------------------------------------------------- | |
220 | -inline void _destructData( | |
221 | +__inline__ __attribute__((always_inline)) void _destructData( | |
222 | void * pValue, | |
223 | typelib_TypeDescriptionReference * pType, | |
224 | typelib_TypeDescription * pTypeDescr, | |
225 | --- cppu/source/uno/eq.hxx.orig 2006-01-16 13:56:23.580831253 +0100 | |
226 | +++ cppu/source/uno/eq.hxx 2006-01-16 13:56:42.250392441 +0100 | |
227 | @@ -53,7 +53,7 @@ | |
228 | //################################################################################################## | |
229 | ||
230 | //-------------------------------------------------------------------------------------------------- | |
231 | -inline sal_Bool _equalObject( | |
232 | +__inline__ __attribute__((always_inline)) sal_Bool _equalObject( | |
233 | void * pI1, void * pI2, | |
234 | uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release ) | |
235 | SAL_THROW( () ) | |
236 | @@ -89,7 +89,7 @@ | |
237 | uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release ) | |
238 | SAL_THROW( () ); | |
239 | //-------------------------------------------------------------------------------------------------- | |
240 | -inline sal_Bool _equalStruct( | |
241 | +__inline__ __attribute__((always_inline)) sal_Bool _equalStruct( | |
242 | void * pDest, void *pSource, | |
243 | typelib_CompoundTypeDescription * pTypeDescr, | |
244 | uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release ) | |
245 | @@ -126,7 +126,7 @@ | |
246 | uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release ) | |
247 | SAL_THROW( () ); | |
248 | //-------------------------------------------------------------------------------------------------- | |
249 | -inline sal_Bool _equalSequence( | |
250 | +__inline__ __attribute__((always_inline)) sal_Bool _equalSequence( | |
251 | uno_Sequence * pDest, uno_Sequence * pSource, | |
252 | typelib_TypeDescriptionReference * pElementType, | |
253 | uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release ) | |
254 | @@ -307,7 +307,7 @@ | |
255 | return sal_False; | |
256 | } | |
257 | //-------------------------------------------------------------------------------------------------- | |
258 | -inline sal_Bool _equalData( | |
259 | +__inline__ __attribute__((always_inline)) sal_Bool _equalData( | |
260 | void * pDest, | |
261 | typelib_TypeDescriptionReference * pDestType, typelib_TypeDescription * pDestTypeDescr, | |
262 | void * pSource, | |
263 | --- cppu/source/uno/prim.hxx.orig 2006-01-16 13:56:50.243492033 +0100 | |
264 | +++ cppu/source/uno/prim.hxx 2006-01-16 13:57:21.161141190 +0100 | |
265 | @@ -83,7 +83,7 @@ | |
266 | extern typelib_TypeDescriptionReference * g_pVoidType; | |
267 | ||
268 | //-------------------------------------------------------------------------------------------------- | |
269 | -inline void * _map( | |
270 | +__inline__ __attribute__((always_inline)) void * _map( | |
271 | void * p, | |
272 | typelib_TypeDescriptionReference * pType, typelib_TypeDescription * pTypeDescr, | |
273 | uno_Mapping * mapping ) | |
274 | @@ -108,7 +108,7 @@ | |
275 | return pRet; | |
276 | } | |
277 | //-------------------------------------------------------------------------------------------------- | |
278 | -inline void _acquire( void * p, uno_AcquireFunc acquire ) SAL_THROW( () ) | |
279 | +__inline__ __attribute__((always_inline)) void _acquire( void * p, uno_AcquireFunc acquire ) SAL_THROW( () ) | |
280 | { | |
281 | if (p) | |
282 | { | |
283 | @@ -123,7 +123,7 @@ | |
284 | } | |
285 | } | |
286 | //-------------------------------------------------------------------------------------------------- | |
287 | -inline void _release( void * p, uno_ReleaseFunc release ) SAL_THROW( () ) | |
288 | +__inline__ __attribute__((always_inline)) void _release( void * p, uno_ReleaseFunc release ) SAL_THROW( () ) | |
289 | { | |
290 | if (p) | |
291 | { | |
292 | @@ -139,7 +139,7 @@ | |
293 | } | |
294 | ||
295 | //------------------------------------------------------------------------------ | |
296 | -inline sal_uInt32 calcSeqMemSize( | |
297 | +__inline__ __attribute__((always_inline)) sal_uInt32 calcSeqMemSize( | |
298 | sal_Int32 nElementSize, sal_Int32 nElements ) | |
299 | { | |
300 | sal_uInt64 nSize = | |
301 | @@ -152,13 +152,13 @@ | |
302 | } | |
303 | ||
304 | //-------------------------------------------------------------------------------------------------- | |
305 | -inline uno_Sequence * createEmptySequence() SAL_THROW( () ) | |
306 | +__inline__ __attribute__((always_inline)) uno_Sequence * createEmptySequence() SAL_THROW( () ) | |
307 | { | |
308 | ::osl_incrementInterlockedCount( &g_emptySeq.nRefCount ); | |
309 | return &g_emptySeq; | |
310 | } | |
311 | //-------------------------------------------------------------------------------------------------- | |
312 | -inline typelib_TypeDescriptionReference * _getVoidType() | |
313 | +__inline__ __attribute__((always_inline)) typelib_TypeDescriptionReference * _getVoidType() | |
314 | SAL_THROW( () ) | |
315 | { | |
316 | if (! g_pVoidType) | |
317 | @@ -188,7 +188,7 @@ | |
318 | void * binuno_queryInterface( void * pUnoI, typelib_TypeDescriptionReference * pDestType ); | |
319 | ||
320 | //-------------------------------------------------------------------------------------------------- | |
321 | -inline typelib_TypeDescriptionReference * _unionGetSetType( | |
322 | +__inline__ __attribute__((always_inline)) typelib_TypeDescriptionReference * _unionGetSetType( | |
323 | void * pUnion, typelib_TypeDescription * pTD ) | |
324 | SAL_THROW( () ) | |
325 | { | |
326 | @@ -214,7 +214,7 @@ | |
327 | return pRet; | |
328 | } | |
329 | //-------------------------------------------------------------------------------------------------- | |
330 | -inline sal_Bool _type_equals( | |
331 | +__inline__ __attribute__((always_inline)) sal_Bool _type_equals( | |
332 | typelib_TypeDescriptionReference * pType1, typelib_TypeDescriptionReference * pType2 ) | |
333 | SAL_THROW( () ) | |
334 | { | |
335 | --- stoc/source/registry_tdprovider/base.hxx.orig 2006-01-16 14:17:21.542252132 +0100 | |
336 | +++ stoc/source/registry_tdprovider/base.hxx 2006-01-16 14:18:13.507903361 +0100 | |
337 | @@ -141,7 +141,7 @@ | |
338 | extern rtl_StandardModuleCount g_moduleCount; | |
339 | ||
340 | //-------------------------------------------------------------------------------------------------- | |
341 | -inline sal_Int32 getRTValueAsInt32( const RTConstValue & rVal ) | |
342 | +__inline__ __attribute__((always_inline)) sal_Int32 getRTValueAsInt32( const RTConstValue & rVal ) | |
343 | { | |
344 | switch (rVal.m_type) | |
345 | { | |
346 | @@ -160,7 +160,7 @@ | |
347 | return 0; | |
348 | } | |
349 | //-------------------------------------------------------------------------------------------------- | |
350 | -inline Any getRTValue( const RTConstValue & rVal ) | |
351 | +__inline__ __attribute__((always_inline)) Any getRTValue( const RTConstValue & rVal ) | |
352 | { | |
353 | switch (rVal.m_type) | |
354 | { | |
355 | --- xmlscript/source/xmldlg_imexp/exp_share.hxx.orig 2006-01-16 14:22:43.893650843 +0100 | |
356 | +++ xmlscript/source/xmldlg_imexp/exp_share.hxx 2006-01-16 14:23:53.559096084 +0100 | |
357 | @@ -71,7 +71,7 @@ | |
358 | ||
359 | ::rtl::OUString _id; | |
360 | ||
361 | - inline Style( short all_ ) SAL_THROW( () ) | |
362 | + __inline__ __attribute__((always_inline)) Style( short all_ ) SAL_THROW( () ) | |
363 | : _fontRelief( css::awt::FontRelief::NONE ) | |
364 | , _fontEmphasisMark( css::awt::FontEmphasisMark::NONE ) | |
365 | , _all( all_ ) | |
366 | @@ -100,7 +100,7 @@ | |
367 | css::uno::Reference< css::beans::XPropertyState > _xPropState; | |
368 | ||
369 | public: | |
370 | - inline ElementDescriptor( | |
371 | + __inline__ __attribute__((always_inline)) ElementDescriptor( | |
372 | css::uno::Reference< css::beans::XPropertySet > const & xProps, | |
373 | css::uno::Reference< css::beans::XPropertyState > const & xPropState, | |
374 | ::rtl::OUString const & name ) | |
375 | @@ -109,39 +109,39 @@ | |
376 | , _xProps( xProps ) | |
377 | , _xPropState( xPropState ) | |
378 | {} | |
379 | - inline ElementDescriptor( | |
380 | + __inline__ __attribute__((always_inline)) ElementDescriptor( | |
381 | ::rtl::OUString const & name ) | |
382 | SAL_THROW( () ) | |
383 | : XMLElement( name ) | |
384 | {} | |
385 | ||
386 | template<typename T> | |
387 | - inline void read( | |
388 | + __inline__ __attribute__((always_inline)) void read( | |
389 | ::rtl::OUString const & propName, ::rtl::OUString const & attrName, | |
390 | bool forceAttribute = false ); | |
391 | ||
392 | // | |
393 | template<typename T> | |
394 | - inline bool readProp( T * ret, ::rtl::OUString const & rPropName ); | |
395 | + __inline__ __attribute__((always_inline)) bool readProp( T * ret, ::rtl::OUString const & rPropName ); | |
396 | css::uno::Any readProp( ::rtl::OUString const & rPropName ); | |
397 | // | |
398 | void readDefaults( bool supportPrintable = true ); | |
399 | // | |
400 | void readStringAttr( | |
401 | ::rtl::OUString const & rPropName, ::rtl::OUString const & rAttrName ); | |
402 | - inline void readDoubleAttr( | |
403 | + __inline__ __attribute__((always_inline)) void readDoubleAttr( | |
404 | ::rtl::OUString const & rPropName, ::rtl::OUString const & rAttrName ) | |
405 | { read<double>( rPropName, rAttrName ); } | |
406 | - inline void readLongAttr( | |
407 | + __inline__ __attribute__((always_inline)) void readLongAttr( | |
408 | ::rtl::OUString const & rPropName, ::rtl::OUString const & rAttrName, | |
409 | bool forceAttribute = false ) | |
410 | { read<sal_Int32>( rPropName, rAttrName, forceAttribute ); } | |
411 | void readHexLongAttr( | |
412 | ::rtl::OUString const & rPropName, ::rtl::OUString const & rAttrName ); | |
413 | - inline void readShortAttr( | |
414 | + __inline__ __attribute__((always_inline)) void readShortAttr( | |
415 | ::rtl::OUString const & rPropName, ::rtl::OUString const & rAttrName ) | |
416 | { read<sal_Int32>( rPropName, rAttrName ); } | |
417 | - inline void readBoolAttr( | |
418 | + __inline__ __attribute__((always_inline)) void readBoolAttr( | |
419 | ::rtl::OUString const & rPropName, ::rtl::OUString const & rAttrName ) | |
420 | { read<sal_Bool>( rPropName, rAttrName ); } | |
421 | ||
422 | @@ -164,7 +164,7 @@ | |
423 | void readLineEndFormatAttr( | |
424 | ::rtl::OUString const & rPropName, ::rtl::OUString const & rAttrName ); | |
425 | // | |
426 | - inline void addBoolAttr( | |
427 | + __inline__ __attribute__((always_inline)) void addBoolAttr( | |
428 | ::rtl::OUString const & rAttrName, sal_Bool bValue ) | |
429 | { addAttribute( rAttrName, ::rtl::OUString::valueOf(bValue) ); } | |
430 | void addNumberFormatAttr( | |
431 | @@ -218,7 +218,7 @@ | |
432 | }; | |
433 | ||
434 | template<typename T> | |
435 | -inline void ElementDescriptor::read( | |
436 | +__inline__ __attribute__((always_inline)) void ElementDescriptor::read( | |
437 | ::rtl::OUString const & propName, ::rtl::OUString const & attrName, | |
438 | bool forceAttribute ) | |
439 | { | |
440 | @@ -236,7 +236,7 @@ | |
441 | } | |
442 | ||
443 | template<typename T> | |
444 | -inline bool ElementDescriptor::readProp( | |
445 | +__inline__ __attribute__((always_inline)) bool ElementDescriptor::readProp( | |
446 | T * ret, ::rtl::OUString const & rPropName ) | |
447 | { | |
448 | _xProps->getPropertyValue( rPropName ) >>= *ret; | |
449 | --- xmlscript/source/xmldlg_imexp/imp_share.hxx.orig 2006-01-16 14:24:07.990666679 +0100 | |
450 | +++ xmlscript/source/xmldlg_imexp/imp_share.hxx 2006-01-16 14:26:13.145925788 +0100 | |
451 | @@ -59,7 +59,7 @@ | |
452 | { | |
453 | ||
454 | // | |
455 | -inline sal_Int32 toInt32( ::rtl::OUString const & rStr ) SAL_THROW( () ) | |
456 | +__inline__ __attribute__((always_inline)) sal_Int32 toInt32( ::rtl::OUString const & rStr ) SAL_THROW( () ) | |
457 | { | |
458 | sal_Int32 nVal; | |
459 | if (rStr.getLength() > 2 && rStr[ 0 ] == '0' && rStr[ 1 ] == 'x') | |
460 | @@ -69,7 +69,7 @@ | |
461 | return nVal; | |
462 | } | |
463 | ||
464 | -inline bool getBoolAttr( | |
465 | +__inline__ __attribute__((always_inline)) bool getBoolAttr( | |
466 | sal_Bool * pRet, ::rtl::OUString const & rAttrName, | |
467 | css::uno::Reference< css::xml::input::XAttributes > const & xAttributes, | |
468 | sal_Int32 nUid ) | |
469 | @@ -97,7 +97,7 @@ | |
470 | return false; | |
471 | } | |
472 | ||
473 | -inline bool getStringAttr( | |
474 | +__inline__ __attribute__((always_inline)) bool getStringAttr( | |
475 | ::rtl::OUString * pRet, ::rtl::OUString const & rAttrName, | |
476 | css::uno::Reference< css::xml::input::XAttributes > const & xAttributes, | |
477 | sal_Int32 nUid ) | |
478 | @@ -106,7 +106,7 @@ | |
479 | return (pRet->getLength() > 0); | |
480 | } | |
481 | ||
482 | -inline bool getLongAttr( | |
483 | +__inline__ __attribute__((always_inline)) bool getLongAttr( | |
484 | sal_Int32 * pRet, ::rtl::OUString const & rAttrName, | |
485 | css::uno::Reference< css::xml::input::XAttributes > const & xAttributes, | |
486 | sal_Int32 nUid ) | |
487 | @@ -140,7 +140,7 @@ | |
488 | sal_Int32 XMLNS_DIALOGS_UID, XMLNS_SCRIPT_UID; | |
489 | ||
490 | public: | |
491 | - inline bool isEventElement( | |
492 | + __inline__ __attribute__((always_inline)) bool isEventElement( | |
493 | sal_Int32 nUid, ::rtl::OUString const & rLocalName ) | |
494 | { | |
495 | return ((XMLNS_SCRIPT_UID == nUid && | |
496 | @@ -161,12 +161,12 @@ | |
497 | ::rtl::OUString const & rStyleId ) const | |
498 | SAL_THROW( () ); | |
499 | ||
500 | - inline css::uno::Reference< css::uno::XComponentContext > | |
501 | + __inline__ __attribute__((always_inline)) css::uno::Reference< css::uno::XComponentContext > | |
502 | const & getComponentContext() SAL_THROW( () ) { return _xContext; } | |
503 | css::uno::Reference< css::util::XNumberFormatsSupplier > | |
504 | const & getNumberFormatsSupplier(); | |
505 | ||
506 | - inline DialogImport( | |
507 | + __inline__ __attribute__((always_inline)) DialogImport( | |
508 | css::uno::Reference<css::uno::XComponentContext> const & xContext, | |
509 | css::uno::Reference<css::container::XNameContainer> | |
510 | const & xDialogModel ) | |
511 | @@ -257,7 +257,7 @@ | |
512 | css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) | |
513 | throw (css::xml::sax::SAXException, css::uno::RuntimeException); | |
514 | ||
515 | - inline StylesElement( | |
516 | + __inline__ __attribute__((always_inline)) StylesElement( | |
517 | ::rtl::OUString const & rLocalName, | |
518 | css::uno::Reference< css::xml::input::XAttributes > const & xAttributes, | |
519 | ElementBase * pParent, DialogImport * pImport ) | |
520 | @@ -312,7 +312,7 @@ | |
521 | bool importVisualEffectStyle( | |
522 | css::uno::Reference< css::beans::XPropertySet > const & xProps ); | |
523 | ||
524 | - inline StyleElement( | |
525 | + __inline__ __attribute__((always_inline)) StyleElement( | |
526 | ::rtl::OUString const & rLocalName, | |
527 | css::uno::Reference< css::xml::input::XAttributes > const & xAttributes, | |
528 | ElementBase * pParent, DialogImport * pImport ) | |
529 | @@ -342,7 +342,7 @@ | |
530 | css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) | |
531 | throw (css::xml::sax::SAXException, css::uno::RuntimeException); | |
532 | ||
533 | - inline MenuPopupElement( | |
534 | + __inline__ __attribute__((always_inline)) MenuPopupElement( | |
535 | ::rtl::OUString const & rLocalName, | |
536 | css::uno::Reference< css::xml::input::XAttributes > const & xAttributes, | |
537 | ElementBase * pParent, DialogImport * pImport ) | |
538 | @@ -387,7 +387,7 @@ | |
539 | ::rtl::OUString _aId; | |
540 | ||
541 | public: | |
542 | - inline ImportContext( | |
543 | + __inline__ __attribute__((always_inline)) ImportContext( | |
544 | DialogImport * pImport, | |
545 | css::uno::Reference< css::beans::XPropertySet > const & xControlModel_, | |
546 | ::rtl::OUString const & id ) | |
547 | @@ -396,7 +396,7 @@ | |
548 | _aId( id ) | |
549 | { OSL_ASSERT( _xControlModel.is() ); } | |
550 | ||
551 | - inline css::uno::Reference< css::beans::XPropertySet > getControlModel() | |
552 | + __inline__ __attribute__((always_inline)) css::uno::Reference< css::beans::XPropertySet > getControlModel() | |
553 | { return _xControlModel; } | |
554 | ||
555 | void importDefaults( | |
556 | @@ -462,7 +462,7 @@ | |
557 | class ControlImportContext : public ImportContext | |
558 | { | |
559 | public: | |
560 | - inline ControlImportContext( | |
561 | + __inline__ __attribute__((always_inline)) ControlImportContext( | |
562 | DialogImport * pImport, | |
563 | ::rtl::OUString const & rId, ::rtl::OUString const & rControlName ) | |
564 | : ImportContext( | |
565 | @@ -471,7 +471,7 @@ | |
566 | pImport->_xDialogModelFactory->createInstance( rControlName ), | |
567 | css::uno::UNO_QUERY_THROW ), rId ) | |
568 | {} | |
569 | - inline ~ControlImportContext() | |
570 | + __inline__ __attribute__((always_inline)) ~ControlImportContext() | |
571 | { | |
572 | _pImport->_xDialogModel->insertByName( | |
573 | _aId, css::uno::makeAny( | |
574 | @@ -493,7 +493,7 @@ | |
575 | virtual void SAL_CALL endElement() | |
576 | throw (css::xml::sax::SAXException, css::uno::RuntimeException); | |
577 | ||
578 | - inline WindowElement( | |
579 | + __inline__ __attribute__((always_inline)) WindowElement( | |
580 | ::rtl::OUString const & rLocalName, | |
581 | css::uno::Reference< css::xml::input::XAttributes > const & xAttributes, | |
582 | ElementBase * pParent, DialogImport * pImport ) | |
583 | @@ -510,7 +510,7 @@ | |
584 | virtual void SAL_CALL endElement() | |
585 | throw (css::xml::sax::SAXException, css::uno::RuntimeException); | |
586 | ||
587 | - inline EventElement( | |
588 | + __inline__ __attribute__((always_inline)) EventElement( | |
589 | sal_Int32 nUid, ::rtl::OUString const & rLocalName, | |
590 | css::uno::Reference< css::xml::input::XAttributes > const & xAttributes, | |
591 | ElementBase * pParent, DialogImport * pImport ) | |
592 | @@ -530,7 +530,7 @@ | |
593 | css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) | |
594 | throw (css::xml::sax::SAXException, css::uno::RuntimeException); | |
595 | ||
596 | - inline BulletinBoardElement( | |
597 | + __inline__ __attribute__((always_inline)) BulletinBoardElement( | |
598 | ::rtl::OUString const & rLocalName, | |
599 | css::uno::Reference< css::xml::input::XAttributes > const & xAttributes, | |
600 | ElementBase * pParent, DialogImport * pImport ) | |
601 | @@ -550,7 +550,7 @@ | |
602 | virtual void SAL_CALL endElement() | |
603 | throw (css::xml::sax::SAXException, css::uno::RuntimeException); | |
604 | ||
605 | - inline ButtonElement( | |
606 | + __inline__ __attribute__((always_inline)) ButtonElement( | |
607 | ::rtl::OUString const & rLocalName, | |
608 | css::uno::Reference< css::xml::input::XAttributes > const & xAttributes, | |
609 | ElementBase * pParent, DialogImport * pImport ) | |
610 | @@ -572,7 +572,7 @@ | |
611 | virtual void SAL_CALL endElement() | |
612 | throw (css::xml::sax::SAXException, css::uno::RuntimeException); | |
613 | ||
614 | - inline CheckBoxElement( | |
615 | + __inline__ __attribute__((always_inline)) CheckBoxElement( | |
616 | ::rtl::OUString const & rLocalName, | |
617 | css::uno::Reference< css::xml::input::XAttributes > const & xAttributes, | |
618 | ElementBase * pParent, DialogImport * pImport ) | |
619 | @@ -595,7 +595,7 @@ | |
620 | virtual void SAL_CALL endElement() | |
621 | throw (css::xml::sax::SAXException, css::uno::RuntimeException); | |
622 | ||
623 | - inline ComboBoxElement( | |
624 | + __inline__ __attribute__((always_inline)) ComboBoxElement( | |
625 | ::rtl::OUString const & rLocalName, | |
626 | css::uno::Reference< css::xml::input::XAttributes > const & xAttributes, | |
627 | ElementBase * pParent, DialogImport * pImport ) | |
628 | @@ -618,7 +618,7 @@ | |
629 | virtual void SAL_CALL endElement() | |
630 | throw (css::xml::sax::SAXException, css::uno::RuntimeException); | |
631 | ||
632 | - inline MenuListElement( | |
633 | + __inline__ __attribute__((always_inline)) MenuListElement( | |
634 | ::rtl::OUString const & rLocalName, | |
635 | css::uno::Reference< css::xml::input::XAttributes > const & xAttributes, | |
636 | ElementBase * pParent, DialogImport * pImport ) | |
637 | @@ -638,7 +638,7 @@ | |
638 | css::uno::Reference<css::xml::input::XAttributes> const & xAttributes ) | |
639 | throw (css::xml::sax::SAXException, css::uno::RuntimeException); | |
640 | ||
641 | - inline RadioElement( | |
642 | + __inline__ __attribute__((always_inline)) RadioElement( | |
643 | ::rtl::OUString const & rLocalName, | |
644 | css::uno::Reference< css::xml::input::XAttributes > const & xAttributes, | |
645 | ElementBase * pParent, DialogImport * pImport ) | |
646 | @@ -661,7 +661,7 @@ | |
647 | void SAL_CALL endElement() | |
648 | throw (css::xml::sax::SAXException, css::uno::RuntimeException); | |
649 | ||
650 | - inline RadioGroupElement( | |
651 | + __inline__ __attribute__((always_inline)) RadioGroupElement( | |
652 | ::rtl::OUString const & rLocalName, | |
653 | css::uno::Reference< css::xml::input::XAttributes > const & xAttributes, | |
654 | ElementBase * pParent, DialogImport * pImport ) | |
655 | @@ -685,7 +685,7 @@ | |
656 | virtual void SAL_CALL endElement() | |
657 | throw (css::xml::sax::SAXException, css::uno::RuntimeException); | |
658 | ||
659 | - inline TitledBoxElement( | |
660 | + __inline__ __attribute__((always_inline)) TitledBoxElement( | |
661 | ::rtl::OUString const & rLocalName, | |
662 | css::uno::Reference< css::xml::input::XAttributes > const & xAttributes, | |
663 | ElementBase * pParent, DialogImport * pImport ) | |
664 | @@ -707,7 +707,7 @@ | |
665 | virtual void SAL_CALL endElement() | |
666 | throw (css::xml::sax::SAXException, css::uno::RuntimeException); | |
667 | ||
668 | - inline TextElement( | |
669 | + __inline__ __attribute__((always_inline)) TextElement( | |
670 | ::rtl::OUString const & rLocalName, | |
671 | css::uno::Reference< css::xml::input::XAttributes > const & xAttributes, | |
672 | ElementBase * pParent, DialogImport * pImport ) | |
673 | @@ -729,7 +729,7 @@ | |
674 | virtual void SAL_CALL endElement() | |
675 | throw (css::xml::sax::SAXException, css::uno::RuntimeException); | |
676 | ||
677 | - inline TextFieldElement( | |
678 | + __inline__ __attribute__((always_inline)) TextFieldElement( | |
679 | ::rtl::OUString const & rLocalName, | |
680 | css::uno::Reference< css::xml::input::XAttributes > const & xAttributes, | |
681 | ElementBase * pParent, DialogImport * pImport ) | |
682 | @@ -751,7 +751,7 @@ | |
683 | virtual void SAL_CALL endElement() | |
684 | throw (css::xml::sax::SAXException, css::uno::RuntimeException); | |
685 | ||
686 | - inline ImageControlElement( | |
687 | + __inline__ __attribute__((always_inline)) ImageControlElement( | |
688 | ::rtl::OUString const & rLocalName, | |
689 | css::uno::Reference< css::xml::input::XAttributes > const & xAttributes, | |
690 | ElementBase * pParent, DialogImport * pImport ) | |
691 | @@ -773,7 +773,7 @@ | |
692 | virtual void SAL_CALL endElement() | |
693 | throw (css::xml::sax::SAXException, css::uno::RuntimeException); | |
694 | ||
695 | - inline FileControlElement( | |
696 | + __inline__ __attribute__((always_inline)) FileControlElement( | |
697 | ::rtl::OUString const & rLocalName, | |
698 | css::uno::Reference< css::xml::input::XAttributes > const & xAttributes, | |
699 | ElementBase * pParent, DialogImport * pImport ) | |
700 | @@ -795,7 +795,7 @@ | |
701 | virtual void SAL_CALL endElement() | |
702 | throw (css::xml::sax::SAXException, css::uno::RuntimeException); | |
703 | ||
704 | - inline CurrencyFieldElement( | |
705 | + __inline__ __attribute__((always_inline)) CurrencyFieldElement( | |
706 | ::rtl::OUString const & rLocalName, | |
707 | css::uno::Reference< css::xml::input::XAttributes > const & xAttributes, | |
708 | ElementBase * pParent, DialogImport * pImport ) | |
709 | @@ -817,7 +817,7 @@ | |
710 | virtual void SAL_CALL endElement() | |
711 | throw (css::xml::sax::SAXException, css::uno::RuntimeException); | |
712 | ||
713 | - inline DateFieldElement( | |
714 | + __inline__ __attribute__((always_inline)) DateFieldElement( | |
715 | ::rtl::OUString const & rLocalName, | |
716 | css::uno::Reference< css::xml::input::XAttributes > const & xAttributes, | |
717 | ElementBase * pParent, DialogImport * pImport ) | |
718 | @@ -839,7 +839,7 @@ | |
719 | virtual void SAL_CALL endElement() | |
720 | throw (css::xml::sax::SAXException, css::uno::RuntimeException); | |
721 | ||
722 | - inline NumericFieldElement( | |
723 | + __inline__ __attribute__((always_inline)) NumericFieldElement( | |
724 | ::rtl::OUString const & rLocalName, | |
725 | css::uno::Reference< css::xml::input::XAttributes > const & xAttributes, | |
726 | ElementBase * pParent, DialogImport * pImport ) | |
727 | @@ -861,7 +861,7 @@ | |
728 | virtual void SAL_CALL endElement() | |
729 | throw (css::xml::sax::SAXException, css::uno::RuntimeException); | |
730 | ||
731 | - inline TimeFieldElement( | |
732 | + __inline__ __attribute__((always_inline)) TimeFieldElement( | |
733 | ::rtl::OUString const & rLocalName, | |
734 | css::uno::Reference< css::xml::input::XAttributes > const & xAttributes, | |
735 | ElementBase * pParent, DialogImport * pImport ) | |
736 | @@ -883,7 +883,7 @@ | |
737 | virtual void SAL_CALL endElement() | |
738 | throw (css::xml::sax::SAXException, css::uno::RuntimeException); | |
739 | ||
740 | - inline PatternFieldElement( | |
741 | + __inline__ __attribute__((always_inline)) PatternFieldElement( | |
742 | ::rtl::OUString const & rLocalName, | |
743 | css::uno::Reference< css::xml::input::XAttributes > const & xAttributes, | |
744 | ElementBase * pParent, DialogImport * pImport ) | |
745 | @@ -905,7 +905,7 @@ | |
746 | virtual void SAL_CALL endElement() | |
747 | throw (css::xml::sax::SAXException, css::uno::RuntimeException); | |
748 | ||
749 | - inline FormattedFieldElement( | |
750 | + __inline__ __attribute__((always_inline)) FormattedFieldElement( | |
751 | ::rtl::OUString const & rLocalName, | |
752 | css::uno::Reference< css::xml::input::XAttributes > const & xAttributes, | |
753 | ElementBase * pParent, DialogImport * pImport ) | |
754 | @@ -927,7 +927,7 @@ | |
755 | virtual void SAL_CALL endElement() | |
756 | throw (css::xml::sax::SAXException, css::uno::RuntimeException); | |
757 | ||
758 | - inline FixedLineElement( | |
759 | + __inline__ __attribute__((always_inline)) FixedLineElement( | |
760 | ::rtl::OUString const & rLocalName, | |
761 | css::uno::Reference< css::xml::input::XAttributes > const & xAttributes, | |
762 | ElementBase * pParent, DialogImport * pImport ) | |
763 | @@ -949,7 +949,7 @@ | |
764 | virtual void SAL_CALL endElement() | |
765 | throw (css::xml::sax::SAXException, css::uno::RuntimeException); | |
766 | ||
767 | - inline ScrollBarElement( | |
768 | + __inline__ __attribute__((always_inline)) ScrollBarElement( | |
769 | ::rtl::OUString const & rLocalName, | |
770 | css::uno::Reference< css::xml::input::XAttributes > const & xAttributes, | |
771 | ElementBase * pParent, DialogImport * pImport ) | |
772 | @@ -971,7 +971,7 @@ | |
773 | virtual void SAL_CALL endElement() | |
774 | throw (css::xml::sax::SAXException, css::uno::RuntimeException); | |
775 | ||
776 | - inline ProgressBarElement( | |
777 | + __inline__ __attribute__((always_inline)) ProgressBarElement( | |
778 | ::rtl::OUString const & rLocalName, | |
779 | css::uno::Reference< css::xml::input::XAttributes > const & xAttributes, | |
780 | ElementBase * pParent, DialogImport * pImport ) | |
781 | --- ucb/source/ucp/file/filinl.hxx.orig 2006-01-16 14:28:42.434450125 +0100 | |
782 | +++ ucb/source/ucp/file/filinl.hxx 2006-01-16 14:29:13.027180332 +0100 | |
783 | @@ -35,52 +35,52 @@ | |
784 | #ifndef _FILINL_HXX_ | |
785 | #define _FILINL_HXX_ | |
786 | ||
787 | -inline const sal_Bool& SAL_CALL shell::MyProperty::IsNative() const | |
788 | +__inline__ __attribute__((always_inline)) const sal_Bool& SAL_CALL shell::MyProperty::IsNative() const | |
789 | { | |
790 | return isNative; | |
791 | } | |
792 | -inline const rtl::OUString& SAL_CALL shell::MyProperty::getPropertyName() const | |
793 | +__inline__ __attribute__((always_inline)) const rtl::OUString& SAL_CALL shell::MyProperty::getPropertyName() const | |
794 | { | |
795 | return PropertyName; | |
796 | } | |
797 | -inline const sal_Int32& SAL_CALL shell::MyProperty::getHandle() const | |
798 | +__inline__ __attribute__((always_inline)) const sal_Int32& SAL_CALL shell::MyProperty::getHandle() const | |
799 | { | |
800 | return Handle; | |
801 | } | |
802 | -inline const com::sun::star::uno::Type& SAL_CALL shell::MyProperty::getType() const | |
803 | +__inline__ __attribute__((always_inline)) const com::sun::star::uno::Type& SAL_CALL shell::MyProperty::getType() const | |
804 | { | |
805 | return Typ; | |
806 | } | |
807 | ||
808 | -inline const com::sun::star::uno::Any& SAL_CALL shell::MyProperty::getValue() const | |
809 | +__inline__ __attribute__((always_inline)) const com::sun::star::uno::Any& SAL_CALL shell::MyProperty::getValue() const | |
810 | { | |
811 | return Value; | |
812 | } | |
813 | -inline const com::sun::star::beans::PropertyState& SAL_CALL shell::MyProperty::getState() const | |
814 | +__inline__ __attribute__((always_inline)) const com::sun::star::beans::PropertyState& SAL_CALL shell::MyProperty::getState() const | |
815 | { | |
816 | return State; | |
817 | } | |
818 | -inline const sal_Int16& SAL_CALL shell::MyProperty::getAttributes() const | |
819 | +__inline__ __attribute__((always_inline)) const sal_Int16& SAL_CALL shell::MyProperty::getAttributes() const | |
820 | { | |
821 | return Attributes; | |
822 | } | |
823 | -inline void SAL_CALL shell::MyProperty::setHandle( const sal_Int32& __Handle ) const | |
824 | +__inline__ __attribute__((always_inline)) void SAL_CALL shell::MyProperty::setHandle( const sal_Int32& __Handle ) const | |
825 | { | |
826 | (( MyProperty* )this )->Handle = __Handle; | |
827 | } | |
828 | -inline void SAL_CALL shell::MyProperty::setType( const com::sun::star::uno::Type& __Typ ) const | |
829 | +__inline__ __attribute__((always_inline)) void SAL_CALL shell::MyProperty::setType( const com::sun::star::uno::Type& __Typ ) const | |
830 | { | |
831 | (( MyProperty* )this )->Typ = __Typ; | |
832 | } | |
833 | -inline void SAL_CALL shell::MyProperty::setValue( const com::sun::star::uno::Any& __Value ) const | |
834 | +__inline__ __attribute__((always_inline)) void SAL_CALL shell::MyProperty::setValue( const com::sun::star::uno::Any& __Value ) const | |
835 | { | |
836 | (( MyProperty* )this )->Value = __Value; | |
837 | } | |
838 | -inline void SAL_CALL shell::MyProperty::setState( const com::sun::star::beans::PropertyState& __State ) const | |
839 | +__inline__ __attribute__((always_inline)) void SAL_CALL shell::MyProperty::setState( const com::sun::star::beans::PropertyState& __State ) const | |
840 | { | |
841 | (( MyProperty* )this )->State = __State; | |
842 | } | |
843 | -inline void SAL_CALL shell::MyProperty::setAttributes( const sal_Int16& __Attributes ) const | |
844 | +__inline__ __attribute__((always_inline)) void SAL_CALL shell::MyProperty::setAttributes( const sal_Int16& __Attributes ) const | |
845 | { | |
846 | (( MyProperty* )this )->Attributes = __Attributes; | |
847 | } | |
848 | --- ucb/source/ucp/file/shell.hxx.orig 2006-01-16 14:29:19.203712596 +0100 | |
849 | +++ ucb/source/ucp/file/shell.hxx 2006-01-16 14:29:28.972391253 +0100 | |
850 | @@ -174,20 +174,20 @@ | |
851 | const sal_Int16& __Attributes ); | |
852 | ||
853 | ~MyProperty(); | |
854 | - inline const sal_Bool& SAL_CALL IsNative() const; | |
855 | - inline const rtl::OUString& SAL_CALL getPropertyName() const; | |
856 | - inline const sal_Int32& SAL_CALL getHandle() const; | |
857 | - inline const com::sun::star::uno::Type& SAL_CALL getType() const; | |
858 | - inline const com::sun::star::uno::Any& SAL_CALL getValue() const; | |
859 | - inline const com::sun::star::beans::PropertyState& SAL_CALL getState() const; | |
860 | - inline const sal_Int16& SAL_CALL getAttributes() const; | |
861 | + __inline__ __attribute__((always_inline)) const sal_Bool& SAL_CALL IsNative() const; | |
862 | + __inline__ __attribute__((always_inline)) const rtl::OUString& SAL_CALL getPropertyName() const; | |
863 | + __inline__ __attribute__((always_inline)) const sal_Int32& SAL_CALL getHandle() const; | |
864 | + __inline__ __attribute__((always_inline)) const com::sun::star::uno::Type& SAL_CALL getType() const; | |
865 | + __inline__ __attribute__((always_inline)) const com::sun::star::uno::Any& SAL_CALL getValue() const; | |
866 | + __inline__ __attribute__((always_inline)) const com::sun::star::beans::PropertyState& SAL_CALL getState() const; | |
867 | + __inline__ __attribute__((always_inline)) const sal_Int16& SAL_CALL getAttributes() const; | |
868 | ||
869 | // The set* functions are declared const, because the key of "this" stays intact | |
870 | - inline void SAL_CALL setHandle( const sal_Int32& __Handle ) const; | |
871 | - inline void SAL_CALL setType( const com::sun::star::uno::Type& __Type ) const; | |
872 | - inline void SAL_CALL setValue( const com::sun::star::uno::Any& __Value ) const; | |
873 | - inline void SAL_CALL setState( const com::sun::star::beans::PropertyState& __State ) const; | |
874 | - inline void SAL_CALL setAttributes( const sal_Int16& __Attributes ) const; | |
875 | + __inline__ __attribute__((always_inline)) void SAL_CALL setHandle( const sal_Int32& __Handle ) const; | |
876 | + __inline__ __attribute__((always_inline)) void SAL_CALL setType( const com::sun::star::uno::Type& __Type ) const; | |
877 | + __inline__ __attribute__((always_inline)) void SAL_CALL setValue( const com::sun::star::uno::Any& __Value ) const; | |
878 | + __inline__ __attribute__((always_inline)) void SAL_CALL setState( const com::sun::star::beans::PropertyState& __State ) const; | |
879 | + __inline__ __attribute__((always_inline)) void SAL_CALL setAttributes( const sal_Int16& __Attributes ) const; | |
880 | }; | |
881 | ||
882 | struct eMyProperty | |
883 | --- configmgr/source/backend/binaryreader.hxx.orig 2005-09-08 05:26:23.000000000 +0200 | |
884 | +++ configmgr/source/backend/binaryreader.hxx 2006-01-16 15:22:25.297474562 +0100 | |
885 | @@ -102,7 +102,7 @@ | |
886 | void read(StringList &_aValue) SAL_THROW( (io::IOException, uno::RuntimeException) ); | |
887 | ||
888 | private: | |
889 | - inline uno::Reference<io::XDataInputStream> getDataInputStream(); | |
890 | + __inline__ __attribute__((always_inline)) uno::Reference<io::XDataInputStream> getDataInputStream(); | |
891 | }; | |
892 | // -------------------------------------------------------------------------- | |
893 | ||
894 | --- configmgr/source/backend/layerdefaultremover.hxx.orig 2006-01-16 15:22:42.793317188 +0100 | |
895 | +++ configmgr/source/backend/layerdefaultremover.hxx 2006-01-16 15:22:51.172324229 +0100 | |
896 | @@ -127,8 +127,8 @@ | |
897 | private: | |
898 | void playBackNodeStack( bool bPlayProperty=false); | |
899 | void raiseMalformedDataException(sal_Char const * pMsg); | |
900 | - inline bool hasPendingProperty(); | |
901 | - inline void clearPendingProperty(); | |
902 | + __inline__ __attribute__((always_inline)) bool hasPendingProperty(); | |
903 | + __inline__ __attribute__((always_inline)) void clearPendingProperty(); | |
904 | private: | |
905 | ResultHandler m_xResultHandler; | |
906 | typedef std::vector<OUString> NodeStack; | |
907 | --- configmgr/source/backend/updatedata.hxx.orig 2006-01-16 15:22:56.462066028 +0100 | |
908 | +++ configmgr/source/backend/updatedata.hxx 2006-01-16 15:23:03.585371703 +0100 | |
909 | @@ -252,7 +252,7 @@ | |
910 | OUString primarySlot() const { return OUString(); } | |
911 | ||
912 | static uno::Any const & getResetMarker(); | |
913 | - static inline bool isResetMarker(uno::Any const & _aValue); | |
914 | + static __inline__ __attribute__((always_inline)) bool isResetMarker(uno::Any const & _aValue); | |
915 | ||
916 | virtual PropertyUpdate * asPropertyUpdate(); | |
917 | }; | |
918 | --- bridges/source/remote/static/remote_types.hxx.orig 2006-01-16 15:26:51.665122950 +0100 | |
919 | +++ bridges/source/remote/static/remote_types.hxx 2006-01-16 15:27:02.484549621 +0100 | |
920 | @@ -49,7 +49,7 @@ | |
921 | namespace bridges_remote | |
922 | { | |
923 | ||
924 | -inline sal_Bool SAL_CALL remote_relatesToInterface( typelib_TypeDescription *pTypeDescr ); | |
925 | +__inline__ __attribute__((always_inline)) sal_Bool SAL_CALL remote_relatesToInterface( typelib_TypeDescription *pTypeDescr ); | |
926 | sal_Bool SAL_CALL remote_relatesToInterface2( typelib_TypeDescription * pTypeDescr ); | |
927 | ||
928 | ||
929 | @@ -58,7 +58,7 @@ | |
930 | @param pTypeDescr type description of type | |
931 | @return true if type might relate to an interface, false otherwise | |
932 | */ | |
933 | -inline sal_Bool SAL_CALL remote_relatesToInterface( typelib_TypeDescription * pTypeDescr ) | |
934 | +__inline__ __attribute__((always_inline)) sal_Bool SAL_CALL remote_relatesToInterface( typelib_TypeDescription * pTypeDescr ) | |
935 | { | |
936 | switch (pTypeDescr->eTypeClass) | |
937 | { | |
938 | @@ -96,7 +96,7 @@ | |
939 | @param pTypeDescr type description of type | |
940 | @return true if type is a cpp simple type, false otherwise | |
941 | */ | |
942 | -inline sal_Bool SAL_CALL remote_isSimpleType( typelib_TypeDescription * pTypeDescr ) | |
943 | +__inline__ __attribute__((always_inline)) sal_Bool SAL_CALL remote_isSimpleType( typelib_TypeDescription * pTypeDescr ) | |
944 | { | |
945 | return (pTypeDescr->eTypeClass <= typelib_TypeClass_ENUM && | |
946 | pTypeDescr->eTypeClass != typelib_TypeClass_STRING && | |
947 | --- configmgr/source/data/anydata.cxx.orig 2005-09-08 05:38:56.000000000 +0200 | |
948 | +++ configmgr/source/data/anydata.cxx 2006-01-16 16:16:35.882302834 +0100 | |
949 | @@ -270,7 +270,7 @@ | |
950 | //----------------------------------------------------------------------------- | |
951 | ||
952 | template <class E> | |
953 | -inline | |
954 | +__inline__ __attribute__((always_inline)) | |
955 | sal_Sequence const * extractSequenceData(uno::Sequence< E > & _rSeq, uno::Any const & _aAny) | |
956 | { | |
957 | if (_aAny >>= _rSeq) | |
958 | --- cppu/inc/com/sun/star/uno/Any.hxx.orig 2006-01-16 16:26:42.632041369 +0100 | |
959 | +++ cppu/inc/com/sun/star/uno/Any.hxx 2006-01-16 16:27:11.202248785 +0100 | |
960 | @@ -64,14 +64,14 @@ | |
961 | { | |
962 | ||
963 | //__________________________________________________________________________________________________ | |
964 | -inline Any::Any() SAL_THROW( () ) | |
965 | +__inline__ __attribute__((always_inline)) Any::Any() SAL_THROW( () ) | |
966 | { | |
967 | ::uno_any_construct( this, 0, 0, (uno_AcquireFunc)cpp_acquire ); | |
968 | } | |
969 | ||
970 | //______________________________________________________________________________ | |
971 | template <typename T> | |
972 | -inline Any::Any( T const & value ) | |
973 | +__inline__ __attribute__((always_inline)) Any::Any( T const & value ) | |
974 | { | |
975 | ::uno_type_any_construct( | |
976 | this, const_cast<T *>(&value), | |
977 | @@ -79,7 +79,7 @@ | |
978 | (uno_AcquireFunc) cpp_acquire ); | |
979 | } | |
980 | //______________________________________________________________________________ | |
981 | -inline Any::Any( bool value ) | |
982 | +__inline__ __attribute__((always_inline)) Any::Any( bool value ) | |
983 | { | |
984 | sal_Bool b = value; | |
985 | ::uno_type_any_construct( | |
986 | @@ -88,37 +88,37 @@ | |
987 | } | |
988 | ||
989 | //__________________________________________________________________________________________________ | |
990 | -inline Any::Any( const Any & rAny ) SAL_THROW( () ) | |
991 | +__inline__ __attribute__((always_inline)) Any::Any( const Any & rAny ) SAL_THROW( () ) | |
992 | { | |
993 | ::uno_type_any_construct( this, rAny.pData, rAny.pType, (uno_AcquireFunc)cpp_acquire ); | |
994 | } | |
995 | //__________________________________________________________________________________________________ | |
996 | -inline Any::Any( const void * pData_, const Type & rType ) SAL_THROW( () ) | |
997 | +__inline__ __attribute__((always_inline)) Any::Any( const void * pData_, const Type & rType ) SAL_THROW( () ) | |
998 | { | |
999 | ::uno_type_any_construct( | |
1000 | this, const_cast< void * >( pData_ ), rType.getTypeLibType(), | |
1001 | (uno_AcquireFunc)cpp_acquire ); | |
1002 | } | |
1003 | //__________________________________________________________________________________________________ | |
1004 | -inline Any::Any( const void * pData_, typelib_TypeDescription * pTypeDescr ) SAL_THROW( () ) | |
1005 | +__inline__ __attribute__((always_inline)) Any::Any( const void * pData_, typelib_TypeDescription * pTypeDescr ) SAL_THROW( () ) | |
1006 | { | |
1007 | ::uno_any_construct( | |
1008 | this, const_cast< void * >( pData_ ), pTypeDescr, (uno_AcquireFunc)cpp_acquire ); | |
1009 | } | |
1010 | //__________________________________________________________________________________________________ | |
1011 | -inline Any::Any( const void * pData_, typelib_TypeDescriptionReference * pType_ ) SAL_THROW( () ) | |
1012 | +__inline__ __attribute__((always_inline)) Any::Any( const void * pData_, typelib_TypeDescriptionReference * pType_ ) SAL_THROW( () ) | |
1013 | { | |
1014 | ::uno_type_any_construct( | |
1015 | this, const_cast< void * >( pData_ ), pType_, (uno_AcquireFunc)cpp_acquire ); | |
1016 | } | |
1017 | //__________________________________________________________________________________________________ | |
1018 | -inline Any::~Any() SAL_THROW( () ) | |
1019 | +__inline__ __attribute__((always_inline)) Any::~Any() SAL_THROW( () ) | |
1020 | { | |
1021 | ::uno_any_destruct( | |
1022 | this, (uno_ReleaseFunc)cpp_release ); | |
1023 | } | |
1024 | //__________________________________________________________________________________________________ | |
1025 | -inline Any & Any::operator = ( const Any & rAny ) SAL_THROW( () ) | |
1026 | +__inline__ __attribute__((always_inline)) Any & Any::operator = ( const Any & rAny ) SAL_THROW( () ) | |
1027 | { | |
1028 | if (this != &rAny) | |
1029 | { | |
1030 | @@ -129,39 +129,39 @@ | |
1031 | return *this; | |
1032 | } | |
1033 | //__________________________________________________________________________________________________ | |
1034 | -inline ::rtl::OUString Any::getValueTypeName() const SAL_THROW( () ) | |
1035 | +__inline__ __attribute__((always_inline)) ::rtl::OUString Any::getValueTypeName() const SAL_THROW( () ) | |
1036 | { | |
1037 | return ::rtl::OUString( pType->pTypeName ); | |
1038 | } | |
1039 | //__________________________________________________________________________________________________ | |
1040 | -inline void Any::setValue( const void * pData_, const Type & rType ) SAL_THROW( () ) | |
1041 | +__inline__ __attribute__((always_inline)) void Any::setValue( const void * pData_, const Type & rType ) SAL_THROW( () ) | |
1042 | { | |
1043 | ::uno_type_any_assign( | |
1044 | this, const_cast< void * >( pData_ ), rType.getTypeLibType(), | |
1045 | (uno_AcquireFunc)cpp_acquire, (uno_ReleaseFunc)cpp_release ); | |
1046 | } | |
1047 | //__________________________________________________________________________________________________ | |
1048 | -inline void Any::setValue( const void * pData_, typelib_TypeDescriptionReference * pType_ ) SAL_THROW( () ) | |
1049 | +__inline__ __attribute__((always_inline)) void Any::setValue( const void * pData_, typelib_TypeDescriptionReference * pType_ ) SAL_THROW( () ) | |
1050 | { | |
1051 | ::uno_type_any_assign( | |
1052 | this, const_cast< void * >( pData_ ), pType_, | |
1053 | (uno_AcquireFunc)cpp_acquire, (uno_ReleaseFunc)cpp_release ); | |
1054 | } | |
1055 | //__________________________________________________________________________________________________ | |
1056 | -inline void Any::setValue( const void * pData_, typelib_TypeDescription * pTypeDescr ) SAL_THROW( () ) | |
1057 | +__inline__ __attribute__((always_inline)) void Any::setValue( const void * pData_, typelib_TypeDescription * pTypeDescr ) SAL_THROW( () ) | |
1058 | { | |
1059 | ::uno_any_assign( | |
1060 | this, const_cast< void * >( pData_ ), pTypeDescr, | |
1061 | (uno_AcquireFunc)cpp_acquire, (uno_ReleaseFunc)cpp_release ); | |
1062 | } | |
1063 | //__________________________________________________________________________________________________ | |
1064 | -inline void Any::clear() SAL_THROW( () ) | |
1065 | +__inline__ __attribute__((always_inline)) void Any::clear() SAL_THROW( () ) | |
1066 | { | |
1067 | ::uno_any_clear( | |
1068 | this, (uno_ReleaseFunc)cpp_release ); | |
1069 | } | |
1070 | //__________________________________________________________________________________________________ | |
1071 | -inline sal_Bool Any::isExtractableTo( const Type & rType ) const SAL_THROW( () ) | |
1072 | +__inline__ __attribute__((always_inline)) sal_Bool Any::isExtractableTo( const Type & rType ) const SAL_THROW( () ) | |
1073 | { | |
1074 | return ::uno_type_isAssignableFromData( | |
1075 | rType.getTypeLibType(), pData, pType, | |
1076 | @@ -170,7 +170,7 @@ | |
1077 | ||
1078 | //______________________________________________________________________________ | |
1079 | template <typename T> | |
1080 | -inline bool Any::has() const | |
1081 | +__inline__ __attribute__((always_inline)) bool Any::has() const | |
1082 | { | |
1083 | Type const & rType = ::cppu::getTypeFavourUnsigned(static_cast< T * >(0)); | |
1084 | return ::uno_type_isAssignableFromData( | |
1085 | @@ -185,14 +185,14 @@ | |
1086 | #endif // ! defined(__SUNPRO_CC) | |
1087 | ||
1088 | //__________________________________________________________________________________________________ | |
1089 | -inline sal_Bool Any::operator == ( const Any & rAny ) const SAL_THROW( () ) | |
1090 | +__inline__ __attribute__((always_inline)) sal_Bool Any::operator == ( const Any & rAny ) const SAL_THROW( () ) | |
1091 | { | |
1092 | return ::uno_type_equalData( | |
1093 | pData, pType, rAny.pData, rAny.pType, | |
1094 | (uno_QueryInterfaceFunc)cpp_queryInterface, (uno_ReleaseFunc)cpp_release ); | |
1095 | } | |
1096 | //__________________________________________________________________________________________________ | |
1097 | -inline sal_Bool Any::operator != ( const Any & rAny ) const SAL_THROW( () ) | |
1098 | +__inline__ __attribute__((always_inline)) sal_Bool Any::operator != ( const Any & rAny ) const SAL_THROW( () ) | |
1099 | { | |
1100 | return (! ::uno_type_equalData( | |
1101 | pData, pType, rAny.pData, rAny.pType, | |
1102 | @@ -201,7 +201,7 @@ | |
1103 | ||
1104 | //__________________________________________________________________________________________________ | |
1105 | template< class C > | |
1106 | -inline Any SAL_CALL makeAny( const C & value ) SAL_THROW( () ) | |
1107 | +__inline__ __attribute__((always_inline)) Any SAL_CALL makeAny( const C & value ) SAL_THROW( () ) | |
1108 | { | |
1109 | return Any( &value, ::cppu::getTypeFavourUnsigned(&value) ); | |
1110 | } | |
1111 | @@ -209,7 +209,7 @@ | |
1112 | // additionally specialized for C++ bool | |
1113 | //______________________________________________________________________________ | |
1114 | template<> | |
1115 | -inline Any SAL_CALL makeAny( bool const & value ) SAL_THROW( () ) | |
1116 | +__inline__ __attribute__((always_inline)) Any SAL_CALL makeAny( bool const & value ) SAL_THROW( () ) | |
1117 | { | |
1118 | const sal_Bool b = value; | |
1119 | return Any( &b, ::getCppuBooleanType() ); | |
1120 | @@ -217,7 +217,7 @@ | |
1121 | ||
1122 | //__________________________________________________________________________________________________ | |
1123 | template< class C > | |
1124 | -inline void SAL_CALL operator <<= ( Any & rAny, const C & value ) SAL_THROW( () ) | |
1125 | +__inline__ __attribute__((always_inline)) void SAL_CALL operator <<= ( Any & rAny, const C & value ) SAL_THROW( () ) | |
1126 | { | |
1127 | const Type & rType = ::cppu::getTypeFavourUnsigned(&value); | |
1128 | ::uno_type_any_assign( | |
1129 | @@ -227,7 +227,7 @@ | |
1130 | ||
1131 | // additionally for C++ bool: | |
1132 | //______________________________________________________________________________ | |
1133 | -inline void SAL_CALL operator <<= ( Any & rAny, bool const & value ) | |
1134 | +__inline__ __attribute__((always_inline)) void SAL_CALL operator <<= ( Any & rAny, bool const & value ) | |
1135 | SAL_THROW( () ) | |
1136 | { | |
1137 | sal_Bool b = value; | |
1138 | @@ -238,7 +238,7 @@ | |
1139 | ||
1140 | //__________________________________________________________________________________________________ | |
1141 | template< class C > | |
1142 | -inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, C & value ) SAL_THROW( () ) | |
1143 | +__inline__ __attribute__((always_inline)) sal_Bool SAL_CALL operator >>= ( const Any & rAny, C & value ) SAL_THROW( () ) | |
1144 | { | |
1145 | const Type & rType = ::cppu::getTypeFavourUnsigned(&value); | |
1146 | return ::uno_type_assignData( | |
1147 | @@ -250,7 +250,7 @@ | |
1148 | ||
1149 | // bool | |
1150 | //__________________________________________________________________________________________________ | |
1151 | -inline sal_Bool SAL_CALL operator >>= ( const ::com::sun::star::uno::Any & rAny, sal_Bool & value ) SAL_THROW( () ) | |
1152 | +__inline__ __attribute__((always_inline)) sal_Bool SAL_CALL operator >>= ( const ::com::sun::star::uno::Any & rAny, sal_Bool & value ) SAL_THROW( () ) | |
1153 | { | |
1154 | if (typelib_TypeClass_BOOLEAN == rAny.pType->eTypeClass) | |
1155 | { | |
1156 | @@ -260,7 +260,7 @@ | |
1157 | return sal_False; | |
1158 | } | |
1159 | //__________________________________________________________________________________________________ | |
1160 | -inline sal_Bool SAL_CALL operator == ( const Any & rAny, const sal_Bool & value ) SAL_THROW( () ) | |
1161 | +__inline__ __attribute__((always_inline)) sal_Bool SAL_CALL operator == ( const Any & rAny, const sal_Bool & value ) SAL_THROW( () ) | |
1162 | { | |
1163 | return (typelib_TypeClass_BOOLEAN == rAny.pType->eTypeClass && | |
1164 | (value != sal_False) == (* reinterpret_cast< const sal_Bool * >( &rAny.pReserved ) != sal_False)); | |
1165 | @@ -268,7 +268,7 @@ | |
1166 | ||
1167 | //______________________________________________________________________________ | |
1168 | template<> | |
1169 | -inline sal_Bool SAL_CALL operator >>= ( Any const & rAny, bool & value ) | |
1170 | +__inline__ __attribute__((always_inline)) sal_Bool SAL_CALL operator >>= ( Any const & rAny, bool & value ) | |
1171 | SAL_THROW( () ) | |
1172 | { | |
1173 | if (rAny.pType->eTypeClass == typelib_TypeClass_BOOLEAN) | |
1174 | @@ -282,7 +282,7 @@ | |
1175 | ||
1176 | //______________________________________________________________________________ | |
1177 | template<> | |
1178 | -inline sal_Bool SAL_CALL operator == ( Any const & rAny, bool const & value ) | |
1179 | +__inline__ __attribute__((always_inline)) sal_Bool SAL_CALL operator == ( Any const & rAny, bool const & value ) | |
1180 | SAL_THROW( () ) | |
1181 | { | |
1182 | return (rAny.pType->eTypeClass == typelib_TypeClass_BOOLEAN && | |
1183 | @@ -293,7 +293,7 @@ | |
1184 | ||
1185 | // byte | |
1186 | //__________________________________________________________________________________________________ | |
1187 | -inline sal_Bool SAL_CALL operator >>= ( const ::com::sun::star::uno::Any & rAny, sal_Int8 & value ) SAL_THROW( () ) | |
1188 | +__inline__ __attribute__((always_inline)) sal_Bool SAL_CALL operator >>= ( const ::com::sun::star::uno::Any & rAny, sal_Int8 & value ) SAL_THROW( () ) | |
1189 | { | |
1190 | if (typelib_TypeClass_BYTE == rAny.pType->eTypeClass) | |
1191 | { | |
1192 | @@ -304,7 +304,7 @@ | |
1193 | } | |
1194 | // short | |
1195 | //__________________________________________________________________________________________________ | |
1196 | -inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, sal_Int16 & value ) SAL_THROW( () ) | |
1197 | +__inline__ __attribute__((always_inline)) sal_Bool SAL_CALL operator >>= ( const Any & rAny, sal_Int16 & value ) SAL_THROW( () ) | |
1198 | { | |
1199 | switch (rAny.pType->eTypeClass) | |
1200 | { | |
1201 | @@ -320,7 +320,7 @@ | |
1202 | } | |
1203 | } | |
1204 | //__________________________________________________________________________________________________ | |
1205 | -inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt16 & value ) SAL_THROW( () ) | |
1206 | +__inline__ __attribute__((always_inline)) sal_Bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt16 & value ) SAL_THROW( () ) | |
1207 | { | |
1208 | switch (rAny.pType->eTypeClass) | |
1209 | { | |
1210 | @@ -337,7 +337,7 @@ | |
1211 | } | |
1212 | // long | |
1213 | //__________________________________________________________________________________________________ | |
1214 | -inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, sal_Int32 & value ) SAL_THROW( () ) | |
1215 | +__inline__ __attribute__((always_inline)) sal_Bool SAL_CALL operator >>= ( const Any & rAny, sal_Int32 & value ) SAL_THROW( () ) | |
1216 | { | |
1217 | switch (rAny.pType->eTypeClass) | |
1218 | { | |
1219 | @@ -359,7 +359,7 @@ | |
1220 | } | |
1221 | } | |
1222 | //__________________________________________________________________________________________________ | |
1223 | -inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt32 & value ) SAL_THROW( () ) | |
1224 | +__inline__ __attribute__((always_inline)) sal_Bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt32 & value ) SAL_THROW( () ) | |
1225 | { | |
1226 | switch (rAny.pType->eTypeClass) | |
1227 | { | |
1228 | @@ -382,7 +382,7 @@ | |
1229 | } | |
1230 | // hyper | |
1231 | //__________________________________________________________________________________________________ | |
1232 | -inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, sal_Int64 & value ) SAL_THROW( () ) | |
1233 | +__inline__ __attribute__((always_inline)) sal_Bool SAL_CALL operator >>= ( const Any & rAny, sal_Int64 & value ) SAL_THROW( () ) | |
1234 | { | |
1235 | switch (rAny.pType->eTypeClass) | |
1236 | { | |
1237 | @@ -412,7 +412,7 @@ | |
1238 | } | |
1239 | } | |
1240 | //__________________________________________________________________________________________________ | |
1241 | -inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt64 & value ) SAL_THROW( () ) | |
1242 | +__inline__ __attribute__((always_inline)) sal_Bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt64 & value ) SAL_THROW( () ) | |
1243 | { | |
1244 | switch (rAny.pType->eTypeClass) | |
1245 | { | |
1246 | @@ -443,7 +443,7 @@ | |
1247 | } | |
1248 | // float | |
1249 | //__________________________________________________________________________________________________ | |
1250 | -inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, float & value ) SAL_THROW( () ) | |
1251 | +__inline__ __attribute__((always_inline)) sal_Bool SAL_CALL operator >>= ( const Any & rAny, float & value ) SAL_THROW( () ) | |
1252 | { | |
1253 | switch (rAny.pType->eTypeClass) | |
1254 | { | |
1255 | @@ -467,7 +467,7 @@ | |
1256 | } | |
1257 | // double | |
1258 | //__________________________________________________________________________________________________ | |
1259 | -inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, double & value ) SAL_THROW( () ) | |
1260 | +__inline__ __attribute__((always_inline)) sal_Bool SAL_CALL operator >>= ( const Any & rAny, double & value ) SAL_THROW( () ) | |
1261 | { | |
1262 | switch (rAny.pType->eTypeClass) | |
1263 | { | |
1264 | @@ -501,7 +501,7 @@ | |
1265 | } | |
1266 | // string | |
1267 | //__________________________________________________________________________________________________ | |
1268 | -inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, ::rtl::OUString & value ) SAL_THROW( () ) | |
1269 | +__inline__ __attribute__((always_inline)) sal_Bool SAL_CALL operator >>= ( const Any & rAny, ::rtl::OUString & value ) SAL_THROW( () ) | |
1270 | { | |
1271 | if (typelib_TypeClass_STRING == rAny.pType->eTypeClass) | |
1272 | { | |
1273 | @@ -511,14 +511,14 @@ | |
1274 | return sal_False; | |
1275 | } | |
1276 | //__________________________________________________________________________________________________ | |
1277 | -inline sal_Bool SAL_CALL operator == ( const Any & rAny, const ::rtl::OUString & value ) SAL_THROW( () ) | |
1278 | +__inline__ __attribute__((always_inline)) sal_Bool SAL_CALL operator == ( const Any & rAny, const ::rtl::OUString & value ) SAL_THROW( () ) | |
1279 | { | |
1280 | return (typelib_TypeClass_STRING == rAny.pType->eTypeClass && | |
1281 | value.equals( * reinterpret_cast< const ::rtl::OUString * >( &rAny.pReserved ) )); | |
1282 | } | |
1283 | // type | |
1284 | //__________________________________________________________________________________________________ | |
1285 | -inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, Type & value ) SAL_THROW( () ) | |
1286 | +__inline__ __attribute__((always_inline)) sal_Bool SAL_CALL operator >>= ( const Any & rAny, Type & value ) SAL_THROW( () ) | |
1287 | { | |
1288 | if (typelib_TypeClass_TYPE == rAny.pType->eTypeClass) | |
1289 | { | |
1290 | @@ -528,14 +528,14 @@ | |
1291 | return sal_False; | |
1292 | } | |
1293 | //__________________________________________________________________________________________________ | |
1294 | -inline sal_Bool SAL_CALL operator == ( const Any & rAny, const Type & value ) SAL_THROW( () ) | |
1295 | +__inline__ __attribute__((always_inline)) sal_Bool SAL_CALL operator == ( const Any & rAny, const Type & value ) SAL_THROW( () ) | |
1296 | { | |
1297 | return (typelib_TypeClass_TYPE == rAny.pType->eTypeClass && | |
1298 | value.equals( * reinterpret_cast< const Type * >( &rAny.pReserved ) )); | |
1299 | } | |
1300 | // any | |
1301 | //__________________________________________________________________________________________________ | |
1302 | -inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, Any & value ) SAL_THROW( () ) | |
1303 | +__inline__ __attribute__((always_inline)) sal_Bool SAL_CALL operator >>= ( const Any & rAny, Any & value ) SAL_THROW( () ) | |
1304 | { | |
1305 | if (&rAny != &value) | |
1306 | { | |
1307 | @@ -547,7 +547,7 @@ | |
1308 | } | |
1309 | // interface | |
1310 | //__________________________________________________________________________________________________ | |
1311 | -inline sal_Bool SAL_CALL operator == ( const Any & rAny, const BaseReference & value ) SAL_THROW( () ) | |
1312 | +__inline__ __attribute__((always_inline)) sal_Bool SAL_CALL operator == ( const Any & rAny, const BaseReference & value ) SAL_THROW( () ) | |
1313 | { | |
1314 | if (typelib_TypeClass_INTERFACE == rAny.pType->eTypeClass) | |
1315 | { | |
1316 | @@ -559,7 +559,7 @@ | |
1317 | // operator to compare to an any. | |
1318 | //__________________________________________________________________________________________________ | |
1319 | template< class C > | |
1320 | -inline sal_Bool SAL_CALL operator == ( const Any & rAny, const C & value ) SAL_THROW( () ) | |
1321 | +__inline__ __attribute__((always_inline)) sal_Bool SAL_CALL operator == ( const Any & rAny, const C & value ) SAL_THROW( () ) | |
1322 | { | |
1323 | const Type & rType = ::cppu::getTypeFavourUnsigned(&value); | |
1324 | return ::uno_type_equalData( | |
1325 | @@ -570,7 +570,7 @@ | |
1326 | // operator to compare to an any. may use specialized operators ==. | |
1327 | //__________________________________________________________________________________________________ | |
1328 | template< class C > | |
1329 | -inline sal_Bool SAL_CALL operator != ( const Any & rAny, const C & value ) SAL_THROW( () ) | |
1330 | +__inline__ __attribute__((always_inline)) sal_Bool SAL_CALL operator != ( const Any & rAny, const C & value ) SAL_THROW( () ) | |
1331 | { | |
1332 | return (! operator == ( rAny, value )); | |
1333 | } | |
1334 | --- bridges/source/remote/urp/urp_job.hxx.orig 2006-01-16 16:33:33.848276784 +0100 | |
1335 | +++ bridges/source/remote/urp/urp_job.hxx 2006-01-16 16:34:09.010917267 +0100 | |
1336 | @@ -53,7 +53,7 @@ | |
1337 | struct urp_BridgeImpl; | |
1338 | ||
1339 | template < class t > | |
1340 | -inline t mymax( const t &t1 , const t &t2 ) | |
1341 | +__inline__ __attribute__((always_inline)) t mymax( const t &t1 , const t &t2 ) | |
1342 | { | |
1343 | return t1 > t2 ? t1 : t2; | |
1344 | } | |
1345 | @@ -76,7 +76,7 @@ | |
1346 | ||
1347 | ~Job(); | |
1348 | ||
1349 | - inline void setUnmarshal( Unmarshal *p ) | |
1350 | + __inline__ __attribute__((always_inline)) void setUnmarshal( Unmarshal *p ) | |
1351 | { m_pUnmarshal = p; } | |
1352 | ||
1353 | public: | |
1354 | @@ -89,7 +89,7 @@ | |
1355 | class ClientJob : public Job | |
1356 | { | |
1357 | public: | |
1358 | - inline ClientJob( uno_Environment *pEnvRemote, // weak ! | |
1359 | + __inline__ __attribute__((always_inline)) ClientJob( uno_Environment *pEnvRemote, // weak ! | |
1360 | struct urp_BridgeImpl *pBridgeImpl, | |
1361 | rtl_uString *pOid, // weak | |
1362 | typelib_TypeDescription * pMemberType, // weak | |
1363 | @@ -102,7 +102,7 @@ | |
1364 | // no release for method type and attribute type necessary, because | |
1365 | // it was acquired by the caller of urp_sendRequest. The lifetime | |
1366 | // of the ClientJob object is always shorter than the urp_sendRequest call. | |
1367 | - inline ~ClientJob() | |
1368 | + __inline__ __attribute__((always_inline)) ~ClientJob() | |
1369 | { | |
1370 | if( m_bReleaseForTypeDescriptionNecessary ) | |
1371 | typelib_typedescription_release( (typelib_TypeDescription*) m_pInterfaceType ); | |
1372 | @@ -114,11 +114,11 @@ | |
1373 | sal_Bool extract( ); | |
1374 | void initiate(); | |
1375 | ||
1376 | - inline void setBridgePropertyCall() | |
1377 | + __inline__ __attribute__((always_inline)) void setBridgePropertyCall() | |
1378 | { m_bBridgePropertyCall = sal_True; } | |
1379 | - inline sal_Bool isBridgePropertyCall() | |
1380 | + __inline__ __attribute__((always_inline)) sal_Bool isBridgePropertyCall() | |
1381 | { return m_bBridgePropertyCall; } | |
1382 | - inline sal_Bool isOneway() | |
1383 | + __inline__ __attribute__((always_inline)) sal_Bool isOneway() | |
1384 | { return m_bOneway; } | |
1385 | public: | |
1386 | typelib_InterfaceMethodTypeDescription *m_pMethodType; | |
1387 | @@ -186,7 +186,7 @@ | |
1388 | ||
1389 | public: | |
1390 | // setMethodType or setAttributeType MUST be called before extract | |
1391 | - inline void setMethodType( | |
1392 | + __inline__ __attribute__((always_inline)) void setMethodType( | |
1393 | typelib_InterfaceMethodTypeDescription *pMethodType, | |
1394 | sal_Bool bIsReleaseCall, | |
1395 | sal_Bool bIsOneway ) | |
1396 | @@ -198,7 +198,7 @@ | |
1397 | m_aTypeInfo[m_nCalls].m_bIsOneway = bIsOneway; | |
1398 | } | |
1399 | ||
1400 | - inline void setAttributeType( | |
1401 | + __inline__ __attribute__((always_inline)) void setAttributeType( | |
1402 | typelib_InterfaceAttributeTypeDescription *pAttributeType, sal_Bool bIsSetter, sal_Bool bIsOneway ) | |
1403 | { | |
1404 | m_aTypeInfo[m_nCalls].m_pAttributeType = pAttributeType; | |
1405 | @@ -208,7 +208,7 @@ | |
1406 | m_aTypeInfo[m_nCalls].m_bIsOneway = bIsOneway; | |
1407 | } | |
1408 | ||
1409 | - inline void setType( typelib_TypeDescriptionReference *pTypeRef ) | |
1410 | + __inline__ __attribute__((always_inline)) void setType( typelib_TypeDescriptionReference *pTypeRef ) | |
1411 | { | |
1412 | m_aEntries[m_nCalls].m_pInterfaceTypeRef = pTypeRef; | |
1413 | typelib_typedescriptionreference_acquire( m_aEntries[m_nCalls].m_pInterfaceTypeRef ); | |
1414 | @@ -217,7 +217,7 @@ | |
1415 | pTypeRef ); | |
1416 | } | |
1417 | // setOid or setInterface MUST be called before extract | |
1418 | - inline void setOid( rtl_uString *pOid ) | |
1419 | + __inline__ __attribute__((always_inline)) void setOid( rtl_uString *pOid ) | |
1420 | { | |
1421 | m_aEntries[m_nCalls].m_pOid = pOid; | |
1422 | rtl_uString_acquire( m_aEntries[m_nCalls].m_pOid ); | |
1423 | @@ -225,22 +225,22 @@ | |
1424 | } | |
1425 | ||
1426 | // setOid or setInterface MUST be called | |
1427 | - inline void setInterface( remote_Interface *pRemoteI ) | |
1428 | + __inline__ __attribute__((always_inline)) void setInterface( remote_Interface *pRemoteI ) | |
1429 | { | |
1430 | m_aEntries[m_nCalls].m_pRemoteI = pRemoteI; | |
1431 | pRemoteI->acquire( pRemoteI ); | |
1432 | m_aEntries[m_nCalls].m_pOid = 0; | |
1433 | } | |
1434 | ||
1435 | - inline void setIgnoreCache( sal_Bool bIgnoreCache ) | |
1436 | + __inline__ __attribute__((always_inline)) void setIgnoreCache( sal_Bool bIgnoreCache ) | |
1437 | { | |
1438 | m_aEntries[m_nCalls].m_bIgnoreCache = bIgnoreCache; | |
1439 | } | |
1440 | ||
1441 | - inline sal_Bool isFull() | |
1442 | + __inline__ __attribute__((always_inline)) sal_Bool isFull() | |
1443 | { return m_nCalls >= m_nMaxMessages; } | |
1444 | ||
1445 | - inline sal_Int8 *getHeap( sal_Int32 nSizeToAlloc ) | |
1446 | + __inline__ __attribute__((always_inline)) sal_Int8 *getHeap( sal_Int32 nSizeToAlloc ) | |
1447 | { | |
1448 | if( nSizeToAlloc + m_nCurrentMemPosition > m_nCurrentMemSize ) | |
1449 | { | |
1450 | @@ -281,7 +281,7 @@ | |
1451 | ||
1452 | ||
1453 | //--------------------------------------------------------------------------------------------- | |
1454 | -inline ClientJob::ClientJob( | |
1455 | +__inline__ __attribute__((always_inline)) ClientJob::ClientJob( | |
1456 | uno_Environment *pEnvRemote, | |
1457 | struct urp_BridgeImpl *pBridgeImpl, | |
1458 | rtl_uString *pOid, | |
1459 | --- bridges/source/remote/urp/urp_marshal.hxx.orig 2005-09-08 00:47:30.000000000 +0200 | |
1460 | +++ bridges/source/remote/urp/urp_marshal.hxx 2006-01-16 16:40:50.035580740 +0100 | |
1461 | @@ -64,7 +64,7 @@ | |
1462 | namespace bridges_urp | |
1463 | { | |
1464 | // methods for accessing marshaling buffer | |
1465 | - inline void Marshal::finish( sal_Int32 nMessageCount ) | |
1466 | + __inline__ __attribute__((always_inline)) void Marshal::finish( sal_Int32 nMessageCount ) | |
1467 | { | |
1468 | sal_Int32 nSize = getSize() - 2*sizeof( sal_Int32 ); | |
1469 | ||
1470 | @@ -73,27 +79,27 @@ | |
1471 | m_pos = pos; | |
1472 | } | |
1473 | ||
1474 | - inline void Marshal::restart() | |
1475 | + __inline__ __attribute__((always_inline)) void Marshal::restart() | |
1476 | { | |
1477 | m_pos = m_base + 2*sizeof( sal_Int32 ); | |
1478 | } | |
1479 | ||
1480 | - inline sal_Int8 *Marshal::getBuffer() | |
1481 | + __inline__ __attribute__((always_inline)) sal_Int8 *Marshal::getBuffer() | |
1482 | { | |
1483 | return m_base; | |
1484 | } | |
1485 | ||
1486 | - inline sal_Bool Marshal::empty() const | |
1487 | + __inline__ __attribute__((always_inline)) sal_Bool Marshal::empty() const | |
1488 | { | |
1489 | return ( m_pos - m_base ) == 2*sizeof( sal_Int32 ); | |
1490 | } | |
1491 | ||
1492 | - inline sal_Int32 Marshal::getSize() | |
1493 | + __inline__ __attribute__((always_inline)) sal_Int32 Marshal::getSize() | |
1494 | { | |
1495 | return ((sal_Int32) (m_pos - m_base)); | |
1496 | } | |
1497 | ||
1498 | - inline void Marshal::ensureAdditionalMem( sal_Int32 nMemToAdd ) | |
1499 | + __inline__ __attribute__((always_inline)) void Marshal::ensureAdditionalMem( sal_Int32 nMemToAdd ) | |
1500 | { | |
1501 | sal_Int32 nDiff = m_pos - m_base; | |
1502 | if( nDiff + nMemToAdd > m_nBufferSize ) | |
1503 | @@ -108,14 +114,14 @@ | |
1504 | } | |
1505 | ||
1506 | // marshaling methods | |
1507 | - inline void Marshal::packInt8( void *pSource ) | |
1508 | + __inline__ __attribute__((always_inline)) void Marshal::packInt8( void *pSource ) | |
1509 | { | |
1510 | ensureAdditionalMem( 1 ); | |
1511 | *m_pos = *((sal_Int8*) pSource ); | |
1512 | m_pos++; | |
1513 | } | |
1514 | ||
1515 | - inline void Marshal::packInt16( void *pSource ) | |
1516 | + __inline__ __attribute__((always_inline)) void Marshal::packInt16( void *pSource ) | |
1517 | { | |
1518 | ensureAdditionalMem( 2 ); | |
1519 | if( isSystemLittleEndian() ) | |
1520 | @@ -131,7 +137,7 @@ | |
1521 | m_pos +=2; | |
1522 | } | |
1523 | ||
1524 | - inline void Marshal::packByteSequence( sal_Int8 *pData , sal_Int32 nLength ) | |
1525 | + __inline__ __attribute__((always_inline)) void Marshal::packByteSequence( sal_Int8 *pData , sal_Int32 nLength ) | |
1526 | { | |
1527 | packCompressedSize( nLength ); | |
1528 | ||
1529 | @@ -140,7 +146,7 @@ | |
1530 | m_pos += nLength; | |
1531 | } | |
1532 | ||
1533 | - inline void Marshal::packString( void *pSource ) | |
1534 | + __inline__ __attribute__((always_inline)) void Marshal::packString( void *pSource ) | |
1535 | { | |
1536 | rtl_uString *p = *( rtl_uString ** ) pSource; | |
1537 | ||
1538 | @@ -156,7 +162,7 @@ | |
1539 | m_pos += nLength; | |
1540 | } | |
1541 | ||
1542 | - inline sal_Bool Marshal::packAny( void *pSource ) | |
1543 | + __inline__ __attribute__((always_inline)) sal_Bool Marshal::packAny( void *pSource ) | |
1544 | { | |
1545 | sal_Bool bSuccess = sal_True; | |
1546 | uno_Any *pAny = (uno_Any * ) pSource; | |
1547 | @@ -182,7 +188,7 @@ | |
1548 | return bSuccess; | |
1549 | } | |
1550 | ||
1551 | - inline void Marshal::packInt32( void *pSource ) | |
1552 | + __inline__ __attribute__((always_inline)) void Marshal::packInt32( void *pSource ) | |
1553 | { | |
1554 | ensureAdditionalMem( 4 ); | |
1555 | if( isSystemLittleEndian() ) | |
1556 | @@ -201,7 +207,7 @@ | |
1557 | m_pos +=4; | |
1558 | } | |
1559 | ||
1560 | - inline void Marshal::packCompressedSize( sal_Int32 nSize ) | |
1561 | + __inline__ __attribute__((always_inline)) void Marshal::packCompressedSize( sal_Int32 nSize ) | |
1562 | { | |
1563 | ensureAdditionalMem( 5 ); | |
1564 | ||
1565 | --- bridges/source/remote/urp/urp_marshal_decl.hxx.orig 2006-01-16 16:43:26.103479464 +0100 | |
1566 | +++ bridges/source/remote/urp/urp_marshal_decl.hxx 2006-01-16 16:43:40.034167817 +0100 | |
1567 | @@ -66,44 +66,44 @@ | |
1568 | void packOid( const ::rtl::OUString &oid ); | |
1569 | void packType( void *pSource ); | |
1570 | ||
1571 | - inline void packCompressedSize( sal_Int32 nSize ); | |
1572 | - inline void packInt8( void *pSource ); | |
1573 | - inline void packInt16( void *pSource ); | |
1574 | - inline void packInt32( void *pSource ); | |
1575 | - inline void packString( void *pSource ); | |
1576 | - inline sal_Bool packAny( void *pSource ); | |
1577 | - inline void packByteSequence( sal_Int8 *pBuffer , sal_Int32 nSize ); | |
1578 | + __inline__ __attribute__((always_inline)) void packCompressedSize( sal_Int32 nSize ); | |
1579 | + __inline__ __attribute__((always_inline)) void packInt8( void *pSource ); | |
1580 | + __inline__ __attribute__((always_inline)) void packInt16( void *pSource ); | |
1581 | + __inline__ __attribute__((always_inline)) void packInt32( void *pSource ); | |
1582 | + __inline__ __attribute__((always_inline)) void packString( void *pSource ); | |
1583 | + __inline__ __attribute__((always_inline)) sal_Bool packAny( void *pSource ); | |
1584 | + __inline__ __attribute__((always_inline)) void packByteSequence( sal_Int8 *pBuffer , sal_Int32 nSize ); | |
1585 | ||
1586 | // can be called during marshaling, but not between | |
1587 | // finish and restart | |
1588 | // returns true, when nothing has been marshaled | |
1589 | - inline sal_Bool empty() const; | |
1590 | + __inline__ __attribute__((always_inline)) sal_Bool empty() const; | |
1591 | ||
1592 | // stops marshaling, inserts size in front of the buffer | |
1593 | // getStart and getSize can now be called | |
1594 | - inline void finish( sal_Int32 nMessageCount ); | |
1595 | + __inline__ __attribute__((always_inline)) void finish( sal_Int32 nMessageCount ); | |
1596 | ||
1597 | // must be called after finish. After calling restart, | |
1598 | // a new marshalling session is started invalidating | |
1599 | // the previous bufer | |
1600 | - inline void restart(); | |
1601 | + __inline__ __attribute__((always_inline)) void restart(); | |
1602 | ||
1603 | // is only valid, after finish has been called. | |
1604 | // valid until destructed. | |
1605 | - inline sal_Int8 *getBuffer(); | |
1606 | + __inline__ __attribute__((always_inline)) sal_Int8 *getBuffer(); | |
1607 | ||
1608 | // is only valid, after finish has been called. | |
1609 | // valid until destructed. | |
1610 | - inline sal_Int32 getSize(); | |
1611 | + __inline__ __attribute__((always_inline)) sal_Int32 getSize(); | |
1612 | ||
1613 | - inline sal_Int32 getPos() | |
1614 | + __inline__ __attribute__((always_inline)) sal_Int32 getPos() | |
1615 | { return m_pos - m_base; } | |
1616 | ||
1617 | - inline sal_Bool isSystemLittleEndian() | |
1618 | + __inline__ __attribute__((always_inline)) sal_Bool isSystemLittleEndian() | |
1619 | { return g_bMarshalSystemIsLittleEndian; } | |
1620 | ||
1621 | private: | |
1622 | - inline void ensureAdditionalMem( sal_Int32 nMemToAdd ); | |
1623 | + __inline__ __attribute__((always_inline)) void ensureAdditionalMem( sal_Int32 nMemToAdd ); | |
1624 | sal_Int32 m_nBufferSize; | |
1625 | sal_Int8 *m_base; | |
1626 | sal_Int8 *m_pos; | |
1627 | --- cppu/inc/typelib/typedescription.hxx.orig 2006-01-16 16:51:30.548333739 +0100 | |
1628 | +++ cppu/inc/typelib/typedescription.hxx 2006-01-16 16:51:53.073980809 +0100 | |
1629 | @@ -72,64 +72,64 @@ | |
1630 | public: | |
1631 | // these are here to force memory de/allocation to sal lib. | |
1632 | /** @internal */ | |
1633 | - inline static void * SAL_CALL operator new ( size_t nSize ) SAL_THROW( () ) | |
1634 | + __inline__ __attribute__((always_inline)) static void * SAL_CALL operator new ( size_t nSize ) SAL_THROW( () ) | |
1635 | { return ::rtl_allocateMemory( nSize ); } | |
1636 | /** @internal */ | |
1637 | - inline static void SAL_CALL operator delete ( void * pMem ) SAL_THROW( () ) | |
1638 | + __inline__ __attribute__((always_inline)) static void SAL_CALL operator delete ( void * pMem ) SAL_THROW( () ) | |
1639 | { ::rtl_freeMemory( pMem ); } | |
1640 | /** @internal */ | |
1641 | - inline static void * SAL_CALL operator new ( size_t, void * pMem ) SAL_THROW( () ) | |
1642 | + __inline__ __attribute__((always_inline)) static void * SAL_CALL operator new ( size_t, void * pMem ) SAL_THROW( () ) | |
1643 | { return pMem; } | |
1644 | /** @internal */ | |
1645 | - inline static void SAL_CALL operator delete ( void *, void * ) SAL_THROW( () ) | |
1646 | + __inline__ __attribute__((always_inline)) static void SAL_CALL operator delete ( void *, void * ) SAL_THROW( () ) | |
1647 | {} | |
1648 | ||
1649 | /** Constructor: | |
1650 | ||
1651 | @param pTypeDescr a type description | |
1652 | */ | |
1653 | - inline TypeDescription( typelib_TypeDescription * pTypeDescr = 0 ) SAL_THROW( () ); | |
1654 | + __inline__ __attribute__((always_inline)) TypeDescription( typelib_TypeDescription * pTypeDescr = 0 ) SAL_THROW( () ); | |
1655 | /** Constructor: | |
1656 | ||
1657 | @param pTypeDescrRef a type description reference | |
1658 | */ | |
1659 | - inline TypeDescription( typelib_TypeDescriptionReference * pTypeDescrRef ) SAL_THROW( () ); | |
1660 | + __inline__ __attribute__((always_inline)) TypeDescription( typelib_TypeDescriptionReference * pTypeDescrRef ) SAL_THROW( () ); | |
1661 | /** Constructor: | |
1662 | ||
1663 | @param rType a type | |
1664 | */ | |
1665 | - inline TypeDescription( const ::com::sun::star::uno::Type & rType ) SAL_THROW( () ); | |
1666 | + __inline__ __attribute__((always_inline)) TypeDescription( const ::com::sun::star::uno::Type & rType ) SAL_THROW( () ); | |
1667 | /** Copy constructor: | |
1668 | ||
1669 | @param rDescr another TypeDescription | |
1670 | */ | |
1671 | - inline TypeDescription( const TypeDescription & rDescr ) SAL_THROW( () ); | |
1672 | + __inline__ __attribute__((always_inline)) TypeDescription( const TypeDescription & rDescr ) SAL_THROW( () ); | |
1673 | /** Constructor: | |
1674 | ||
1675 | @param pTypeName a type name | |
1676 | */ | |
1677 | - inline TypeDescription( rtl_uString * pTypeName ) SAL_THROW( () ); | |
1678 | + __inline__ __attribute__((always_inline)) TypeDescription( rtl_uString * pTypeName ) SAL_THROW( () ); | |
1679 | /** Constructor: | |
1680 | ||
1681 | @param rTypeName a type name | |
1682 | */ | |
1683 | - inline TypeDescription( const ::rtl::OUString & rTypeName ) SAL_THROW( () ); | |
1684 | + __inline__ __attribute__((always_inline)) TypeDescription( const ::rtl::OUString & rTypeName ) SAL_THROW( () ); | |
1685 | /** Destructor: releases type description | |
1686 | */ | |
1687 | - inline ~TypeDescription() SAL_THROW( () ); | |
1688 | + __inline__ __attribute__((always_inline)) ~TypeDescription() SAL_THROW( () ); | |
1689 | ||
1690 | /** Assignment operator: acquires given type description and releases a set one. | |
1691 | ||
1692 | @param pTypeDescr another type description | |
1693 | @return this TypeDescription | |
1694 | */ | |
1695 | - inline TypeDescription & SAL_CALL operator = ( typelib_TypeDescription * pTypeDescr ) SAL_THROW( () ); | |
1696 | + __inline__ __attribute__((always_inline)) TypeDescription & SAL_CALL operator = ( typelib_TypeDescription * pTypeDescr ) SAL_THROW( () ); | |
1697 | /** Assignment operator: acquires given type description and releases a set one. | |
1698 | ||
1699 | @param rTypeDescr another type description | |
1700 | @return this TypeDescription | |
1701 | */ | |
1702 | - inline TypeDescription & SAL_CALL operator =( const TypeDescription & rTypeDescr ) SAL_THROW( () ) | |
1703 | + __inline__ __attribute__((always_inline)) TypeDescription & SAL_CALL operator =( const TypeDescription & rTypeDescr ) SAL_THROW( () ) | |
1704 | { return this->operator =( rTypeDescr.get() ); } | |
1705 | ||
1706 | /** Tests whether two type descriptions are equal. | |
1707 | @@ -137,80 +137,80 @@ | |
1708 | @param pTypeDescr another type description | |
1709 | @return true, if both type descriptions are equal, false otherwise | |
1710 | */ | |
1711 | - inline sal_Bool SAL_CALL equals( const typelib_TypeDescription * pTypeDescr ) const SAL_THROW( () ); | |
1712 | + __inline__ __attribute__((always_inline)) sal_Bool SAL_CALL equals( const typelib_TypeDescription * pTypeDescr ) const SAL_THROW( () ); | |
1713 | /** Tests whether two type descriptions are equal. | |
1714 | ||
1715 | @param rTypeDescr another type description | |
1716 | @return true, if both type descriptions are equal, false otherwise | |
1717 | */ | |
1718 | - inline sal_Bool SAL_CALL equals( const TypeDescription & rTypeDescr ) const SAL_THROW( () ) | |
1719 | + __inline__ __attribute__((always_inline)) sal_Bool SAL_CALL equals( const TypeDescription & rTypeDescr ) const SAL_THROW( () ) | |
1720 | { return equals( rTypeDescr._pTypeDescr ); } | |
1721 | ||
1722 | /** Makes stored type description complete. | |
1723 | */ | |
1724 | - inline void SAL_CALL makeComplete() const SAL_THROW( () ); | |
1725 | + __inline__ __attribute__((always_inline)) void SAL_CALL makeComplete() const SAL_THROW( () ); | |
1726 | ||
1727 | /** Gets the UNacquired type description pointer. | |
1728 | ||
1729 | @return stored pointer of type description | |
1730 | */ | |
1731 | - inline typelib_TypeDescription * SAL_CALL get() const SAL_THROW( () ) | |
1732 | + __inline__ __attribute__((always_inline)) typelib_TypeDescription * SAL_CALL get() const SAL_THROW( () ) | |
1733 | { return _pTypeDescr; } | |
1734 | /** Tests if a type description is set. | |
1735 | ||
1736 | @return true, if a type description is set, false otherwise | |
1737 | */ | |
1738 | - inline sal_Bool SAL_CALL is() const SAL_THROW( () ) | |
1739 | + __inline__ __attribute__((always_inline)) sal_Bool SAL_CALL is() const SAL_THROW( () ) | |
1740 | { return (_pTypeDescr != 0); } | |
1741 | }; | |
1742 | //__________________________________________________________________________________________________ | |
1743 | -inline TypeDescription::TypeDescription( typelib_TypeDescription * pTypeDescr ) SAL_THROW( () ) | |
1744 | +__inline__ __attribute__((always_inline)) TypeDescription::TypeDescription( typelib_TypeDescription * pTypeDescr ) SAL_THROW( () ) | |
1745 | : _pTypeDescr( pTypeDescr ) | |
1746 | { | |
1747 | if (_pTypeDescr) | |
1748 | typelib_typedescription_acquire( _pTypeDescr ); | |
1749 | } | |
1750 | //__________________________________________________________________________________________________ | |
1751 | -inline TypeDescription::TypeDescription( typelib_TypeDescriptionReference * pTypeDescrRef ) SAL_THROW( () ) | |
1752 | +__inline__ __attribute__((always_inline)) TypeDescription::TypeDescription( typelib_TypeDescriptionReference * pTypeDescrRef ) SAL_THROW( () ) | |
1753 | : _pTypeDescr( 0 ) | |
1754 | { | |
1755 | if (pTypeDescrRef) | |
1756 | typelib_typedescriptionreference_getDescription( &_pTypeDescr, pTypeDescrRef ); | |
1757 | } | |
1758 | //__________________________________________________________________________________________________ | |
1759 | -inline TypeDescription::TypeDescription( const ::com::sun::star::uno::Type & rType ) SAL_THROW( () ) | |
1760 | +__inline__ __attribute__((always_inline)) TypeDescription::TypeDescription( const ::com::sun::star::uno::Type & rType ) SAL_THROW( () ) | |
1761 | : _pTypeDescr( 0 ) | |
1762 | { | |
1763 | if (rType.getTypeLibType()) | |
1764 | typelib_typedescriptionreference_getDescription( &_pTypeDescr, rType.getTypeLibType() ); | |
1765 | } | |
1766 | //__________________________________________________________________________________________________ | |
1767 | -inline TypeDescription::TypeDescription( const TypeDescription & rTypeDescr ) SAL_THROW( () ) | |
1768 | +__inline__ __attribute__((always_inline)) TypeDescription::TypeDescription( const TypeDescription & rTypeDescr ) SAL_THROW( () ) | |
1769 | : _pTypeDescr( rTypeDescr._pTypeDescr ) | |
1770 | { | |
1771 | if (_pTypeDescr) | |
1772 | typelib_typedescription_acquire( _pTypeDescr ); | |
1773 | } | |
1774 | //__________________________________________________________________________________________________ | |
1775 | -inline TypeDescription::TypeDescription( rtl_uString * pTypeName ) SAL_THROW( () ) | |
1776 | +__inline__ __attribute__((always_inline)) TypeDescription::TypeDescription( rtl_uString * pTypeName ) SAL_THROW( () ) | |
1777 | : _pTypeDescr( 0 ) | |
1778 | { | |
1779 | typelib_typedescription_getByName( &_pTypeDescr , pTypeName ); | |
1780 | } | |
1781 | //__________________________________________________________________________________________________ | |
1782 | -inline TypeDescription::TypeDescription( const ::rtl::OUString & rTypeName ) SAL_THROW( () ) | |
1783 | +__inline__ __attribute__((always_inline)) TypeDescription::TypeDescription( const ::rtl::OUString & rTypeName ) SAL_THROW( () ) | |
1784 | : _pTypeDescr( 0 ) | |
1785 | { | |
1786 | typelib_typedescription_getByName( &_pTypeDescr , rTypeName.pData ); | |
1787 | } | |
1788 | //__________________________________________________________________________________________________ | |
1789 | -inline TypeDescription::~TypeDescription() SAL_THROW( () ) | |
1790 | +__inline__ __attribute__((always_inline)) TypeDescription::~TypeDescription() SAL_THROW( () ) | |
1791 | { | |
1792 | if (_pTypeDescr) | |
1793 | typelib_typedescription_release( _pTypeDescr ); | |
1794 | } | |
1795 | //__________________________________________________________________________________________________ | |
1796 | -inline TypeDescription & TypeDescription::operator = ( typelib_TypeDescription * pTypeDescr ) SAL_THROW( () ) | |
1797 | +__inline__ __attribute__((always_inline)) TypeDescription & TypeDescription::operator = ( typelib_TypeDescription * pTypeDescr ) SAL_THROW( () ) | |
1798 | { | |
1799 | if (pTypeDescr) | |
1800 | typelib_typedescription_acquire( pTypeDescr ); | |
1801 | @@ -220,13 +220,13 @@ | |
1802 | return *this; | |
1803 | } | |
1804 | //__________________________________________________________________________________________________ | |
1805 | -inline sal_Bool TypeDescription::equals( const typelib_TypeDescription * pTypeDescr ) const SAL_THROW( () ) | |
1806 | +__inline__ __attribute__((always_inline)) sal_Bool TypeDescription::equals( const typelib_TypeDescription * pTypeDescr ) const SAL_THROW( () ) | |
1807 | { | |
1808 | return (_pTypeDescr && pTypeDescr && | |
1809 | typelib_typedescription_equals( _pTypeDescr, pTypeDescr )); | |
1810 | } | |
1811 | //__________________________________________________________________________________________________ | |
1812 | -inline void TypeDescription::makeComplete() const SAL_THROW( () ) | |
1813 | +__inline__ __attribute__((always_inline)) void TypeDescription::makeComplete() const SAL_THROW( () ) | |
1814 | { | |
1815 | if (_pTypeDescr && !_pTypeDescr->bComplete) | |
1816 | ::typelib_typedescription_complete( &_pTypeDescr ); | |
1817 | --- cppu/inc/com/sun/star/uno/Type.hxx.orig 2006-01-16 16:58:37.892781115 +0100 | |
1818 | +++ cppu/inc/com/sun/star/uno/Type.hxx 2006-01-16 16:59:01.552158800 +0100 | |
1819 | @@ -56,53 +56,53 @@ | |
1820 | { | |
1821 | ||
1822 | //__________________________________________________________________________________________________ | |
1823 | -inline Type::Type() SAL_THROW( () ) | |
1824 | +__inline__ __attribute__((always_inline)) Type::Type() SAL_THROW( () ) | |
1825 | { | |
1826 | _pType = reinterpret_cast< const ::com::sun::star::uno::Type * >( | |
1827 | ::typelib_static_type_getByTypeClass( typelib_TypeClass_VOID ) )->getTypeLibType(); | |
1828 | ::typelib_typedescriptionreference_acquire( _pType ); | |
1829 | } | |
1830 | //__________________________________________________________________________________________________ | |
1831 | -inline Type::Type( TypeClass eTypeClass, const ::rtl::OUString & rTypeName ) SAL_THROW( () ) | |
1832 | +__inline__ __attribute__((always_inline)) Type::Type( TypeClass eTypeClass, const ::rtl::OUString & rTypeName ) SAL_THROW( () ) | |
1833 | : _pType( 0 ) | |
1834 | { | |
1835 | ::typelib_typedescriptionreference_new( &_pType, (typelib_TypeClass)eTypeClass, rTypeName.pData ); | |
1836 | } | |
1837 | //__________________________________________________________________________________________________ | |
1838 | -inline Type::Type( TypeClass eTypeClass, const sal_Char * pTypeName ) SAL_THROW( () ) | |
1839 | +__inline__ __attribute__((always_inline)) Type::Type( TypeClass eTypeClass, const sal_Char * pTypeName ) SAL_THROW( () ) | |
1840 | : _pType( 0 ) | |
1841 | { | |
1842 | ::typelib_typedescriptionreference_newByAsciiName( &_pType, (typelib_TypeClass)eTypeClass, pTypeName ); | |
1843 | } | |
1844 | //__________________________________________________________________________________________________ | |
1845 | -inline Type::Type( typelib_TypeDescriptionReference * pType ) SAL_THROW( () ) | |
1846 | +__inline__ __attribute__((always_inline)) Type::Type( typelib_TypeDescriptionReference * pType ) SAL_THROW( () ) | |
1847 | : _pType( pType ) | |
1848 | { | |
1849 | ::typelib_typedescriptionreference_acquire( _pType ); | |
1850 | } | |
1851 | //__________________________________________________________________________________________________ | |
1852 | -inline Type::Type( typelib_TypeDescriptionReference * pType, UnoType_NoAcquire ) SAL_THROW( () ) | |
1853 | +__inline__ __attribute__((always_inline)) Type::Type( typelib_TypeDescriptionReference * pType, UnoType_NoAcquire ) SAL_THROW( () ) | |
1854 | : _pType( pType ) | |
1855 | { | |
1856 | } | |
1857 | //__________________________________________________________________________________________________ | |
1858 | -inline Type::Type( typelib_TypeDescriptionReference * pType, __sal_NoAcquire ) SAL_THROW( () ) | |
1859 | +__inline__ __attribute__((always_inline)) Type::Type( typelib_TypeDescriptionReference * pType, __sal_NoAcquire ) SAL_THROW( () ) | |
1860 | : _pType( pType ) | |
1861 | { | |
1862 | } | |
1863 | //__________________________________________________________________________________________________ | |
1864 | -inline Type::Type( const Type & rType ) SAL_THROW( () ) | |
1865 | +__inline__ __attribute__((always_inline)) Type::Type( const Type & rType ) SAL_THROW( () ) | |
1866 | : _pType( rType._pType ) | |
1867 | { | |
1868 | ::typelib_typedescriptionreference_acquire( _pType ); | |
1869 | } | |
1870 | //__________________________________________________________________________________________________ | |
1871 | -inline ::rtl::OUString Type::getTypeName() const SAL_THROW( () ) | |
1872 | +__inline__ __attribute__((always_inline)) ::rtl::OUString Type::getTypeName() const SAL_THROW( () ) | |
1873 | { | |
1874 | return ::rtl::OUString( _pType->pTypeName ); | |
1875 | } | |
1876 | //__________________________________________________________________________________________________ | |
1877 | -inline Type & Type::operator = ( const Type & rType ) SAL_THROW( () ) | |
1878 | +__inline__ __attribute__((always_inline)) Type & Type::operator = ( const Type & rType ) SAL_THROW( () ) | |
1879 | { | |
1880 | ::typelib_typedescriptionreference_assign( &_pType, rType._pType ); | |
1881 | return *this; | |
1882 | @@ -117,100 +117,100 @@ | |
1883 | } | |
1884 | } | |
1885 | ||
1886 | -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const ::com::sun::star::uno::Type * ) SAL_THROW( () ) | |
1887 | +__inline__ __attribute__((always_inline)) const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const ::com::sun::star::uno::Type * ) SAL_THROW( () ) | |
1888 | { | |
1889 | return ::cppu::UnoType< ::com::sun::star::uno::Type >::get(); | |
1890 | } | |
1891 | ||
1892 | -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuVoidType() SAL_THROW( () ) | |
1893 | +__inline__ __attribute__((always_inline)) const ::com::sun::star::uno::Type & SAL_CALL getCppuVoidType() SAL_THROW( () ) | |
1894 | { | |
1895 | return ::cppu::UnoType< ::cppu::UnoVoidType >::get(); | |
1896 | } | |
1897 | -inline const ::com::sun::star::uno::Type & SAL_CALL getVoidCppuType() SAL_THROW( () ) | |
1898 | +__inline__ __attribute__((always_inline)) const ::com::sun::star::uno::Type & SAL_CALL getVoidCppuType() SAL_THROW( () ) | |
1899 | { | |
1900 | return ::cppu::UnoType< ::cppu::UnoVoidType >::get(); | |
1901 | } | |
1902 | ||
1903 | -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuBooleanType() SAL_THROW( () ) | |
1904 | +__inline__ __attribute__((always_inline)) const ::com::sun::star::uno::Type & SAL_CALL getCppuBooleanType() SAL_THROW( () ) | |
1905 | { | |
1906 | return ::cppu::UnoType< bool >::get(); | |
1907 | } | |
1908 | -inline const ::com::sun::star::uno::Type & SAL_CALL getBooleanCppuType() SAL_THROW( () ) | |
1909 | +__inline__ __attribute__((always_inline)) const ::com::sun::star::uno::Type & SAL_CALL getBooleanCppuType() SAL_THROW( () ) | |
1910 | { | |
1911 | return ::cppu::UnoType< bool >::get(); | |
1912 | } | |
1913 | -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_Bool * ) SAL_THROW( () ) | |
1914 | +__inline__ __attribute__((always_inline)) const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_Bool * ) SAL_THROW( () ) | |
1915 | { | |
1916 | return ::cppu::UnoType< bool >::get(); | |
1917 | } | |
1918 | ||
1919 | -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( | |
1920 | +__inline__ __attribute__((always_inline)) const ::com::sun::star::uno::Type & SAL_CALL getCppuType( | |
1921 | bool const * ) SAL_THROW( () ) | |
1922 | { | |
1923 | return ::cppu::UnoType< bool >::get(); | |
1924 | } | |
1925 | ||
1926 | -inline const ::com::sun::star::uno::Type & SAL_CALL getCharCppuType() SAL_THROW( () ) | |
1927 | +__inline__ __attribute__((always_inline)) const ::com::sun::star::uno::Type & SAL_CALL getCharCppuType() SAL_THROW( () ) | |
1928 | { | |
1929 | return ::cppu::UnoType< ::cppu::UnoCharType >::get(); | |
1930 | } | |
1931 | -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuCharType() SAL_THROW( () ) | |
1932 | +__inline__ __attribute__((always_inline)) const ::com::sun::star::uno::Type & SAL_CALL getCppuCharType() SAL_THROW( () ) | |
1933 | { | |
1934 | return ::cppu::UnoType< ::cppu::UnoCharType >::get(); | |
1935 | } | |
1936 | ||
1937 | -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_Int8 * ) SAL_THROW( () ) | |
1938 | +__inline__ __attribute__((always_inline)) const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_Int8 * ) SAL_THROW( () ) | |
1939 | { | |
1940 | return ::cppu::UnoType< ::sal_Int8 >::get(); | |
1941 | } | |
1942 | ||
1943 | -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const ::rtl::OUString * ) SAL_THROW( () ) | |
1944 | +__inline__ __attribute__((always_inline)) const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const ::rtl::OUString * ) SAL_THROW( () ) | |
1945 | { | |
1946 | return ::cppu::UnoType< ::rtl::OUString >::get(); | |
1947 | } | |
1948 | ||
1949 | -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_Int16 * ) SAL_THROW( () ) | |
1950 | +__inline__ __attribute__((always_inline)) const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_Int16 * ) SAL_THROW( () ) | |
1951 | { | |
1952 | return ::cppu::UnoType< ::sal_Int16 >::get(); | |
1953 | } | |
1954 | ||
1955 | -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_uInt16 * ) SAL_THROW( () ) | |
1956 | +__inline__ __attribute__((always_inline)) const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_uInt16 * ) SAL_THROW( () ) | |
1957 | { | |
1958 | return ::cppu::UnoType< ::cppu::UnoUnsignedShortType >::get(); | |
1959 | } | |
1960 | ||
1961 | -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_Int32 * ) SAL_THROW( () ) | |
1962 | +__inline__ __attribute__((always_inline)) const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_Int32 * ) SAL_THROW( () ) | |
1963 | { | |
1964 | return ::cppu::UnoType< ::sal_Int32 >::get(); | |
1965 | } | |
1966 | ||
1967 | -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_uInt32 * ) SAL_THROW( () ) | |
1968 | +__inline__ __attribute__((always_inline)) const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_uInt32 * ) SAL_THROW( () ) | |
1969 | { | |
1970 | return ::cppu::UnoType< ::sal_uInt32 >::get(); | |
1971 | } | |
1972 | ||
1973 | -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_Int64 * ) SAL_THROW( () ) | |
1974 | +__inline__ __attribute__((always_inline)) const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_Int64 * ) SAL_THROW( () ) | |
1975 | { | |
1976 | return ::cppu::UnoType< ::sal_Int64 >::get(); | |
1977 | } | |
1978 | ||
1979 | -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_uInt64 * ) SAL_THROW( () ) | |
1980 | +__inline__ __attribute__((always_inline)) const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_uInt64 * ) SAL_THROW( () ) | |
1981 | { | |
1982 | return ::cppu::UnoType< ::sal_uInt64 >::get(); | |
1983 | } | |
1984 | ||
1985 | -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const float * ) SAL_THROW( () ) | |
1986 | +__inline__ __attribute__((always_inline)) const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const float * ) SAL_THROW( () ) | |
1987 | { | |
1988 | return ::cppu::UnoType< float >::get(); | |
1989 | } | |
1990 | ||
1991 | -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const double * ) SAL_THROW( () ) | |
1992 | +__inline__ __attribute__((always_inline)) const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const double * ) SAL_THROW( () ) | |
1993 | { | |
1994 | return ::cppu::UnoType< double >::get(); | |
1995 | } | |
1996 | ||
1997 | template< class T > | |
1998 | -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuArrayType1( T * pT ) SAL_THROW( () ) | |
1999 | +__inline__ __attribute__((always_inline)) const ::com::sun::star::uno::Type & SAL_CALL getCppuArrayType1( T * pT ) SAL_THROW( () ) | |
2000 | { | |
2001 | if (! ::com::sun::star::uno::Array< T >::s_pType) | |
2002 | { | |
2003 | @@ -227,7 +227,7 @@ | |
2004 | } | |
2005 | ||
2006 | template< class T > | |
2007 | -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuArrayType2( T * pT ) SAL_THROW( () ) | |
2008 | +__inline__ __attribute__((always_inline)) const ::com::sun::star::uno::Type & SAL_CALL getCppuArrayType2( T * pT ) SAL_THROW( () ) | |
2009 | { | |
2010 | if (! ::com::sun::star::uno::Array< T >::s_pType) | |
2011 | { | |
2012 | @@ -245,7 +245,7 @@ | |
2013 | } | |
2014 | ||
2015 | template< class T > | |
2016 | -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuArrayType3( T * pT ) SAL_THROW( () ) | |
2017 | +__inline__ __attribute__((always_inline)) const ::com::sun::star::uno::Type & SAL_CALL getCppuArrayType3( T * pT ) SAL_THROW( () ) | |
2018 | { | |
2019 | if (! ::com::sun::star::uno::Array< T >::s_pType) | |
2020 | { | |
2021 | @@ -264,7 +264,7 @@ | |
2022 | } | |
2023 | ||
2024 | template< class T > | |
2025 | -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuArrayType4( T * pT ) SAL_THROW( () ) | |
2026 | +__inline__ __attribute__((always_inline)) const ::com::sun::star::uno::Type & SAL_CALL getCppuArrayType4( T * pT ) SAL_THROW( () ) | |
2027 | { | |
2028 | if (! ::com::sun::star::uno::Array< T >::s_pType) | |
2029 | { | |
2030 | @@ -284,7 +284,7 @@ | |
2031 | } | |
2032 | ||
2033 | template< class T > | |
2034 | -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuArrayType5( T * pT ) SAL_THROW( () ) | |
2035 | +__inline__ __attribute__((always_inline)) const ::com::sun::star::uno::Type & SAL_CALL getCppuArrayType5( T * pT ) SAL_THROW( () ) | |
2036 | { | |
2037 | if (! ::com::sun::star::uno::Array< T >::s_pType) | |
2038 | { | |
2039 | @@ -305,7 +305,7 @@ | |
2040 | } | |
2041 | ||
2042 | template< class T > | |
2043 | -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuArrayType6( T * pT ) SAL_THROW( () ) | |
2044 | +__inline__ __attribute__((always_inline)) const ::com::sun::star::uno::Type & SAL_CALL getCppuArrayType6( T * pT ) SAL_THROW( () ) | |
2045 | { | |
2046 | if (! ::com::sun::star::uno::Array< T >::s_pType) | |
2047 | { | |
2048 | @@ -327,13 +327,13 @@ | |
2049 | } | |
2050 | ||
2051 | template< typename T > | |
2052 | -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType() SAL_THROW(()) | |
2053 | +__inline__ __attribute__((always_inline)) const ::com::sun::star::uno::Type & SAL_CALL getCppuType() SAL_THROW(()) | |
2054 | { | |
2055 | return ::cppu::UnoType< T >::get(); | |
2056 | } | |
2057 | ||
2058 | template<> | |
2059 | -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType< sal_Unicode >() | |
2060 | +__inline__ __attribute__((always_inline)) const ::com::sun::star::uno::Type & SAL_CALL getCppuType< sal_Unicode >() | |
2061 | SAL_THROW(()) | |
2062 | { | |
2063 | return ::cppu::UnoType< ::cppu::UnoCharType >::get(); | |
2064 | --- cppu/inc/com/sun/star/uno/Type.h.orig 2006-01-16 10:56:09.000000000 +0100 | |
2065 | +++ cppu/inc/com/sun/star/uno/Type.h 2006-01-16 17:13:06.603807255 +0100 | |
2066 | @@ -89,41 +89,41 @@ | |
2067 | public: | |
2068 | // these are here to force memory de/allocation to sal lib. | |
2069 | /** @internal */ | |
2070 | - inline static void * SAL_CALL operator new ( size_t nSize ) SAL_THROW( () ) | |
2071 | + __inline__ __attribute__((always_inline)) static void * SAL_CALL operator new ( size_t nSize ) SAL_THROW( () ) | |
2072 | { return ::rtl_allocateMemory( nSize ); } | |
2073 | /** @internal */ | |
2074 | - inline static void SAL_CALL operator delete ( void * pMem ) SAL_THROW( () ) | |
2075 | + __inline__ __attribute__((always_inline)) static void SAL_CALL operator delete ( void * pMem ) SAL_THROW( () ) | |
2076 | { ::rtl_freeMemory( pMem ); } | |
2077 | /** @internal */ | |
2078 | - inline static void * SAL_CALL operator new ( size_t, void * pMem ) SAL_THROW( () ) | |
2079 | + __inline__ __attribute__((always_inline)) static void * SAL_CALL operator new ( size_t, void * pMem ) SAL_THROW( () ) | |
2080 | { return pMem; } | |
2081 | /** @internal */ | |
2082 | - inline static void SAL_CALL operator delete ( void *, void * ) SAL_THROW( () ) | |
2083 | + __inline__ __attribute__((always_inline)) static void SAL_CALL operator delete ( void *, void * ) SAL_THROW( () ) | |
2084 | {} | |
2085 | ||
2086 | /** Default Constructor: Type is set to void. | |
2087 | */ | |
2088 | - inline Type() SAL_THROW( () ); | |
2089 | + __inline__ __attribute__((always_inline)) Type() SAL_THROW( () ); | |
2090 | ||
2091 | /** Constructor: Type is constructed by given name and type class. | |
2092 | ||
2093 | @param eTypeClass type class of type | |
2094 | @param rTypeName name of type | |
2095 | */ | |
2096 | - inline Type( TypeClass eTypeClass, const ::rtl::OUString & rTypeName ) SAL_THROW( () ); | |
2097 | + __inline__ __attribute__((always_inline)) Type( TypeClass eTypeClass, const ::rtl::OUString & rTypeName ) SAL_THROW( () ); | |
2098 | ||
2099 | /** Constructor: Type is constructed by given name and type class. | |
2100 | ||
2101 | @param eTypeClass type class of type | |
2102 | @param pTypeName name of type | |
2103 | */ | |
2104 | - inline Type( TypeClass eTypeClass, const sal_Char * pTypeName ) SAL_THROW( () ); | |
2105 | + __inline__ __attribute__((always_inline)) Type( TypeClass eTypeClass, const sal_Char * pTypeName ) SAL_THROW( () ); | |
2106 | ||
2107 | /** Constructor: Type is (copy) constructed by given C type description reference. | |
2108 | ||
2109 | @param pType C type description reference | |
2110 | */ | |
2111 | - inline Type( typelib_TypeDescriptionReference * pType ) SAL_THROW( () ); | |
2112 | + __inline__ __attribute__((always_inline)) Type( typelib_TypeDescriptionReference * pType ) SAL_THROW( () ); | |
2113 | ||
2114 | /** Constructor: Type is (copy) constructed by given C type description reference | |
2115 | without acquiring it. | |
2116 | @@ -131,24 +131,24 @@ | |
2117 | @param pType C type description reference | |
2118 | @param dummy UNO_TYPE_NO_ACQUIRE to force obvious distinction to other constructors | |
2119 | */ | |
2120 | - inline Type( typelib_TypeDescriptionReference * pType, UnoType_NoAcquire ) SAL_THROW( () ); | |
2121 | + __inline__ __attribute__((always_inline)) Type( typelib_TypeDescriptionReference * pType, UnoType_NoAcquire ) SAL_THROW( () ); | |
2122 | /** Constructor: Type is (copy) constructed by given C type description reference | |
2123 | without acquiring it. | |
2124 | ||
2125 | @param pType C type description reference | |
2126 | @param dummy SAL_NO_ACQUIRE to force obvious distinction to other constructors | |
2127 | */ | |
2128 | - inline Type( typelib_TypeDescriptionReference * pType, __sal_NoAcquire ) SAL_THROW( () ); | |
2129 | + __inline__ __attribute__((always_inline)) Type( typelib_TypeDescriptionReference * pType, __sal_NoAcquire ) SAL_THROW( () ); | |
2130 | ||
2131 | /** Copy constructor: Type is copy constructed by given type. | |
2132 | ||
2133 | @param rType another type | |
2134 | */ | |
2135 | - inline Type( const Type & rType ) SAL_THROW( () ); | |
2136 | + __inline__ __attribute__((always_inline)) Type( const Type & rType ) SAL_THROW( () ); | |
2137 | ||
2138 | /** Destructor: Releases acquired C type description reference. | |
2139 | */ | |
2140 | - inline ~Type() SAL_THROW( () ) | |
2141 | + __inline__ __attribute__((always_inline)) ~Type() SAL_THROW( () ) | |
2142 | { ::typelib_typedescriptionreference_release( _pType ); } | |
2143 | ||
2144 | /** Assignment operator: Acquires right side type and releases previously set type. | |
2145 | @@ -156,33 +156,33 @@ | |
2146 | @param rType another type (right side) | |
2147 | @return this type | |
2148 | */ | |
2149 | - inline Type & SAL_CALL operator = ( const Type & rType ) SAL_THROW( () ); | |
2150 | + __inline__ __attribute__((always_inline)) Type & SAL_CALL operator = ( const Type & rType ) SAL_THROW( () ); | |
2151 | ||
2152 | /** Gets the type class of set type. | |
2153 | ||
2154 | @return type class of set type | |
2155 | */ | |
2156 | - inline TypeClass SAL_CALL getTypeClass() const SAL_THROW( () ) | |
2157 | + __inline__ __attribute__((always_inline)) TypeClass SAL_CALL getTypeClass() const SAL_THROW( () ) | |
2158 | { return (TypeClass)_pType->eTypeClass; } | |
2159 | ||
2160 | /** Gets the name of the set type. | |
2161 | ||
2162 | @return name of the set type | |
2163 | */ | |
2164 | - inline ::rtl::OUString SAL_CALL getTypeName() const SAL_THROW( () ); | |
2165 | + __inline__ __attribute__((always_inline)) ::rtl::OUString SAL_CALL getTypeName() const SAL_THROW( () ); | |
2166 | ||
2167 | /** Obtains a full type description of set type. | |
2168 | ||
2169 | @param ppDescr [inout] type description | |
2170 | */ | |
2171 | - inline void SAL_CALL getDescription( typelib_TypeDescription ** ppDescr ) const SAL_THROW( () ) | |
2172 | + __inline__ __attribute__((always_inline)) void SAL_CALL getDescription( typelib_TypeDescription ** ppDescr ) const SAL_THROW( () ) | |
2173 | { ::typelib_typedescriptionreference_getDescription( ppDescr, _pType ); } | |
2174 | ||
2175 | /** Gets the C typelib type description reference pointer. Does not acquire the reference! | |
2176 | ||
2177 | @return UNacquired type description reference | |
2178 | */ | |
2179 | - inline typelib_TypeDescriptionReference * SAL_CALL getTypeLibType() const SAL_THROW( () ) | |
2180 | + __inline__ __attribute__((always_inline)) typelib_TypeDescriptionReference * SAL_CALL getTypeLibType() const SAL_THROW( () ) | |
2181 | { return _pType; } | |
2182 | ||
2183 | /** Tests if values of this reflected type can be assigned by values of given type. | |
2184 | @@ -193,7 +193,7 @@ | |
2185 | @return true if values of this type can be assigned from values of given type, | |
2186 | false otherwise | |
2187 | */ | |
2188 | - inline sal_Bool SAL_CALL isAssignableFrom( const Type & rType ) const SAL_THROW( () ) | |
2189 | + __inline__ __attribute__((always_inline)) sal_Bool SAL_CALL isAssignableFrom( const Type & rType ) const SAL_THROW( () ) | |
2190 | { return ::typelib_typedescriptionreference_isAssignableFrom( _pType, rType._pType ); } | |
2191 | ||
2192 | /** Compares two types. | |
2193 | @@ -201,21 +201,21 @@ | |
2194 | @param rType another type | |
2195 | @return true if both types refer the same type, false otherwise | |
2196 | */ | |
2197 | - inline sal_Bool SAL_CALL equals( const Type & rType ) const SAL_THROW( () ) | |
2198 | + __inline__ __attribute__((always_inline)) sal_Bool SAL_CALL equals( const Type & rType ) const SAL_THROW( () ) | |
2199 | { return ::typelib_typedescriptionreference_equals( _pType, rType._pType ); } | |
2200 | /** Equality operator: Compares two types. | |
2201 | ||
2202 | @param rType another type | |
2203 | @return true if both types refer the same type, false otherwise | |
2204 | */ | |
2205 | - inline sal_Bool SAL_CALL operator == ( const Type & rType ) const SAL_THROW( () ) | |
2206 | + __inline__ __attribute__((always_inline)) sal_Bool SAL_CALL operator == ( const Type & rType ) const SAL_THROW( () ) | |
2207 | { return ::typelib_typedescriptionreference_equals( _pType, rType._pType ); } | |
2208 | /** Unequality operator: Compares two types. | |
2209 | ||
2210 | @param rType another type | |
2211 | @return false if both types refer the same type, true otherwise | |
2212 | */ | |
2213 | - inline sal_Bool SAL_CALL operator != ( const Type & rType ) const SAL_THROW( () ) | |
2214 | + __inline__ __attribute__((always_inline)) sal_Bool SAL_CALL operator != ( const Type & rType ) const SAL_THROW( () ) | |
2215 | { return (! ::typelib_typedescriptionreference_equals( _pType, rType._pType )); } | |
2216 | }; | |
2217 | ||
2218 | @@ -241,28 +241,28 @@ | |
2219 | @param dummy typed pointer for function signature | |
2220 | @return type of IDL type "type" | |
2221 | */ | |
2222 | -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const ::com::sun::star::uno::Type * ) SAL_THROW( () ); | |
2223 | +__inline__ __attribute__((always_inline)) const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const ::com::sun::star::uno::Type * ) SAL_THROW( () ); | |
2224 | ||
2225 | /** Gets the meta type of IDL type void. | |
2226 | @return type of IDL type void | |
2227 | */ | |
2228 | -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuVoidType() SAL_THROW( () ); | |
2229 | +__inline__ __attribute__((always_inline)) const ::com::sun::star::uno::Type & SAL_CALL getCppuVoidType() SAL_THROW( () ); | |
2230 | /** Gets the meta type of IDL type void. | |
2231 | ||
2232 | @return type of IDL type void | |
2233 | */ | |
2234 | -inline const ::com::sun::star::uno::Type & SAL_CALL getVoidCppuType() SAL_THROW( () ); | |
2235 | +__inline__ __attribute__((always_inline)) const ::com::sun::star::uno::Type & SAL_CALL getVoidCppuType() SAL_THROW( () ); | |
2236 | ||
2237 | /** Gets the meta type of IDL type boolean. | |
2238 | ||
2239 | @return type of IDL type boolean | |
2240 | */ | |
2241 | -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuBooleanType() SAL_THROW( () ); | |
2242 | +__inline__ __attribute__((always_inline)) const ::com::sun::star::uno::Type & SAL_CALL getCppuBooleanType() SAL_THROW( () ); | |
2243 | /** Gets the meta type of IDL type boolean. | |
2244 | ||
2245 | @return type of IDL type boolean | |
2246 | */ | |
2247 | -inline const ::com::sun::star::uno::Type & SAL_CALL getBooleanCppuType() SAL_THROW( () ); | |
2248 | +__inline__ __attribute__((always_inline)) const ::com::sun::star::uno::Type & SAL_CALL getBooleanCppuType() SAL_THROW( () ); | |
2249 | /** Gets the meta type of IDL type boolean. | |
2250 | ||
2251 | There are cases (involving templates) where uses of getCppuType are known to | |
2252 | @@ -271,7 +271,7 @@ | |
2253 | @param dummy typed pointer for function signature | |
2254 | @return type of IDL type boolean | |
2255 | */ | |
2256 | -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_Bool * ) SAL_THROW( () ); | |
2257 | +__inline__ __attribute__((always_inline)) const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_Bool * ) SAL_THROW( () ); | |
2258 | /** Gets the meta type of IDL type boolean. | |
2259 | ||
2260 | There are cases (involving templates) where uses of getCppuType are known to | |
2261 | @@ -280,19 +280,19 @@ | |
2262 | @param dummy typed pointer for function signature | |
2263 | @return type of IDL type boolean | |
2264 | */ | |
2265 | -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( | |
2266 | +__inline__ __attribute__((always_inline)) const ::com::sun::star::uno::Type & SAL_CALL getCppuType( | |
2267 | bool const * ) SAL_THROW( () ); | |
2268 | ||
2269 | /** Gets the meta type of IDL type char. | |
2270 | ||
2271 | @return type of IDL type char | |
2272 | */ | |
2273 | -inline const ::com::sun::star::uno::Type & SAL_CALL getCharCppuType() SAL_THROW( () ); | |
2274 | +__inline__ __attribute__((always_inline)) const ::com::sun::star::uno::Type & SAL_CALL getCharCppuType() SAL_THROW( () ); | |
2275 | /** Gets the meta type of IDL type char. | |
2276 | ||
2277 | @return type of IDL type char | |
2278 | */ | |
2279 | -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuCharType() SAL_THROW( () ); | |
2280 | +__inline__ __attribute__((always_inline)) const ::com::sun::star::uno::Type & SAL_CALL getCppuCharType() SAL_THROW( () ); | |
2281 | ||
2282 | /** Gets the meta type of IDL type byte. | |
2283 | ||
2284 | @@ -302,7 +302,7 @@ | |
2285 | @param dummy typed pointer for function signature | |
2286 | @return type of IDL type byte | |
2287 | */ | |
2288 | -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_Int8 * ) SAL_THROW( () ); | |
2289 | +__inline__ __attribute__((always_inline)) const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_Int8 * ) SAL_THROW( () ); | |
2290 | ||
2291 | /** Gets the meta type of IDL type string. | |
2292 | ||
2293 | @@ -312,7 +312,7 @@ | |
2294 | @param dummy typed pointer for function signature | |
2295 | @return type of IDL type string | |
2296 | */ | |
2297 | -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const ::rtl::OUString * ) SAL_THROW( () ); | |
2298 | +__inline__ __attribute__((always_inline)) const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const ::rtl::OUString * ) SAL_THROW( () ); | |
2299 | ||
2300 | /** Gets the meta type of IDL type short. | |
2301 | ||
2302 | @@ -322,7 +322,7 @@ | |
2303 | @param dummy typed pointer for function signature | |
2304 | @return type of IDL type short | |
2305 | */ | |
2306 | -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_Int16 * ) SAL_THROW( () ); | |
2307 | +__inline__ __attribute__((always_inline)) const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_Int16 * ) SAL_THROW( () ); | |
2308 | ||
2309 | /** Gets the meta type of IDL type unsigned short. | |
2310 | ||
2311 | @@ -332,7 +332,7 @@ | |
2312 | @param dummy typed pointer for function signature | |
2313 | @return type of IDL type unsigned short | |
2314 | */ | |
2315 | -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_uInt16 * ) SAL_THROW( () ); | |
2316 | +__inline__ __attribute__((always_inline)) const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_uInt16 * ) SAL_THROW( () ); | |
2317 | ||
2318 | /** Gets the meta type of IDL type long. | |
2319 | ||
2320 | @@ -342,7 +342,7 @@ | |
2321 | @param dummy typed pointer for function signature | |
2322 | @return type of IDL type long | |
2323 | */ | |
2324 | -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_Int32 * ) SAL_THROW( () ); | |
2325 | +__inline__ __attribute__((always_inline)) const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_Int32 * ) SAL_THROW( () ); | |
2326 | ||
2327 | /** Gets the meta type of IDL type unsigned long. | |
2328 | ||
2329 | @@ -352,7 +352,7 @@ | |
2330 | @param dummy typed pointer for function signature | |
2331 | @return type of IDL type unsigned long | |
2332 | */ | |
2333 | -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_uInt32 * ) SAL_THROW( () ); | |
2334 | +__inline__ __attribute__((always_inline)) const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_uInt32 * ) SAL_THROW( () ); | |
2335 | ||
2336 | /** Gets the meta type of IDL type hyper. | |
2337 | ||
2338 | @@ -362,7 +362,7 @@ | |
2339 | @param dummy typed pointer for function signature | |
2340 | @return type of IDL type hyper | |
2341 | */ | |
2342 | -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_Int64 * ) SAL_THROW( () ); | |
2343 | +__inline__ __attribute__((always_inline)) const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_Int64 * ) SAL_THROW( () ); | |
2344 | ||
2345 | /** Gets the meta type of IDL type unsigned hyper. | |
2346 | ||
2347 | @@ -372,7 +372,7 @@ | |
2348 | @param dummy typed pointer for function signature | |
2349 | @return type of IDL type unsigned hyper | |
2350 | */ | |
2351 | -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_uInt64 * ) SAL_THROW( () ); | |
2352 | +__inline__ __attribute__((always_inline)) const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_uInt64 * ) SAL_THROW( () ); | |
2353 | ||
2354 | /** Gets the meta type of IDL type float. | |
2355 | ||
2356 | @@ -382,7 +382,7 @@ | |
2357 | @param dummy typed pointer for function signature | |
2358 | @return type of IDL type float | |
2359 | */ | |
2360 | -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const float * ) SAL_THROW( () ); | |
2361 | +__inline__ __attribute__((always_inline)) const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const float * ) SAL_THROW( () ); | |
2362 | ||
2363 | /** Gets the meta type of IDL type double. | |
2364 | ||
2365 | @@ -392,7 +392,7 @@ | |
2366 | @param dummy typed pointer for function signature | |
2367 | @return type of IDL type double | |
2368 | */ | |
2369 | -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const double * ) SAL_THROW( () ); | |
2370 | +__inline__ __attribute__((always_inline)) const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const double * ) SAL_THROW( () ); | |
2371 | ||
2372 | /** Array template function to get meta type for one-dimensional arrays. | |
2373 | ||
2374 | @@ -400,42 +400,42 @@ | |
2375 | @return type of array | |
2376 | */ | |
2377 | template< class T > | |
2378 | -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuArrayType1( T * pT ) SAL_THROW( () ); | |
2379 | +__inline__ __attribute__((always_inline)) const ::com::sun::star::uno::Type & SAL_CALL getCppuArrayType1( T * pT ) SAL_THROW( () ); | |
2380 | /** Array template function to get meta type for two-dimensional arrays. | |
2381 | ||
2382 | @param pT array pointer | |
2383 | @return type of array | |
2384 | */ | |
2385 | template< class T > | |
2386 | -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuArrayType2( T * pT ) SAL_THROW( () ); | |
2387 | +__inline__ __attribute__((always_inline)) const ::com::sun::star::uno::Type & SAL_CALL getCppuArrayType2( T * pT ) SAL_THROW( () ); | |
2388 | /** Array template function to get meta type for three-dimensional arrays. | |
2389 | ||
2390 | @param pT array pointer | |
2391 | @return type of array | |
2392 | */ | |
2393 | template< class T > | |
2394 | -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuArrayType3( T * pT ) SAL_THROW( () ); | |
2395 | +__inline__ __attribute__((always_inline)) const ::com::sun::star::uno::Type & SAL_CALL getCppuArrayType3( T * pT ) SAL_THROW( () ); | |
2396 | /** Array template function to get meta type for four-dimensional arrays. | |
2397 | ||
2398 | @param pT array pointer | |
2399 | @return type of array | |
2400 | */ | |
2401 | template< class T > | |
2402 | -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuArrayType4( T * pT ) SAL_THROW( () ); | |
2403 | +__inline__ __attribute__((always_inline)) const ::com::sun::star::uno::Type & SAL_CALL getCppuArrayType4( T * pT ) SAL_THROW( () ); | |
2404 | /** Array template function to get meta type for five-dimensional arrays. | |
2405 | ||
2406 | @param pT array pointer | |
2407 | @return type of array | |
2408 | */ | |
2409 | template< class T > | |
2410 | -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuArrayType5( T * pT ) SAL_THROW( () ); | |
2411 | +__inline__ __attribute__((always_inline)) const ::com::sun::star::uno::Type & SAL_CALL getCppuArrayType5( T * pT ) SAL_THROW( () ); | |
2412 | /** Array template function to get meta type for six-dimensional arrays. | |
2413 | ||
2414 | @param pT array pointer | |
2415 | @return type of array | |
2416 | */ | |
2417 | template< class T > | |
2418 | -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuArrayType6( T * pT ) SAL_THROW( () ); | |
2419 | +__inline__ __attribute__((always_inline)) const ::com::sun::star::uno::Type & SAL_CALL getCppuArrayType6( T * pT ) SAL_THROW( () ); | |
2420 | ||
2421 | /** Gets the meta type of an IDL type. | |
2422 | ||
2423 | @@ -450,7 +450,7 @@ | |
2424 | ||
2425 | @since UDK 3.2.0 | |
2426 | */ | |
2427 | -template< typename T > inline const ::com::sun::star::uno::Type & SAL_CALL | |
2428 | +template< typename T > __inline__ __attribute__((always_inline)) const ::com::sun::star::uno::Type & SAL_CALL | |
2429 | getCppuType() SAL_THROW(()); | |
2430 | ||
2431 | /** Gets the meta type of IDL type char. | |
2432 | @@ -459,7 +459,7 @@ | |
2433 | ||
2434 | @since UDK 3.2.0 | |
2435 | */ | |
2436 | -template<> inline const ::com::sun::star::uno::Type & SAL_CALL | |
2437 | +template<> __inline__ __attribute__((always_inline)) const ::com::sun::star::uno::Type & SAL_CALL | |
2438 | getCppuType< sal_Unicode >() SAL_THROW(()); | |
2439 | ||
2440 | #endif | |
2441 | --- bridges/source/remote/urp/urp_marshal.cxx.orig 2006-01-16 18:54:24.956659179 +0100 | |
2442 | +++ bridges/source/remote/urp/urp_marshal.cxx 2006-01-16 18:55:09.579055256 +0100 | |
2443 | @@ -65,6 +65,144 @@ | |
2444 | rtl_freeMemory( m_base ); | |
2445 | } | |
2446 | ||
2447 | +sal_Bool Marshal::pack( void *pSource , typelib_TypeDescription *pType ) | |
2448 | +{ | |
2449 | + sal_Bool bSuccess = sal_True; | |
2450 | + switch( pType->eTypeClass ) | |
2451 | + { | |
2452 | + case typelib_TypeClass_BYTE: | |
2453 | + { | |
2454 | + packInt8( pSource ); | |
2455 | + break; | |
2456 | + } | |
2457 | + case typelib_TypeClass_BOOLEAN: | |
2458 | + { | |
2459 | + ensureAdditionalMem( 1 ); | |
2460 | + *m_pos = ( *((sal_Bool*) pSource ) ) ? 1 : 0; | |
2461 | + m_pos++; | |
2462 | + break; | |
2463 | + } | |
2464 | + | |
2465 | + case typelib_TypeClass_CHAR: | |
2466 | + case typelib_TypeClass_SHORT: | |
2467 | + case typelib_TypeClass_UNSIGNED_SHORT: | |
2468 | + { | |
2469 | + packInt16( pSource ); | |
2470 | + break; | |
2471 | + } | |
2472 | + case typelib_TypeClass_ENUM: | |
2473 | + case typelib_TypeClass_LONG: | |
2474 | + case typelib_TypeClass_UNSIGNED_LONG: | |
2475 | + case typelib_TypeClass_FLOAT: | |
2476 | + { | |
2477 | + packInt32( pSource ); | |
2478 | + break; | |
2479 | + } | |
2480 | + case typelib_TypeClass_DOUBLE: | |
2481 | + case typelib_TypeClass_HYPER: | |
2482 | + case typelib_TypeClass_UNSIGNED_HYPER: | |
2483 | + { | |
2484 | + ensureAdditionalMem( 8 ); | |
2485 | + if( isSystemLittleEndian() ) | |
2486 | + { | |
2487 | + m_pos[0] = ((unsigned char *)pSource)[7]; | |
2488 | + m_pos[1] = ((unsigned char *)pSource)[6]; | |
2489 | + m_pos[2] = ((unsigned char *)pSource)[5]; | |
2490 | + m_pos[3] = ((unsigned char *)pSource)[4]; | |
2491 | + m_pos[4] = ((unsigned char *)pSource)[3]; | |
2492 | + m_pos[5] = ((unsigned char *)pSource)[2]; | |
2493 | + m_pos[6] = ((unsigned char *)pSource)[1]; | |
2494 | + m_pos[7] = ((unsigned char *)pSource)[0]; | |
2495 | + } | |
2496 | + else | |
2497 | + { | |
2498 | + m_pos[7] = ((unsigned char *)pSource)[7]; | |
2499 | + m_pos[6] = ((unsigned char *)pSource)[6]; | |
2500 | + m_pos[5] = ((unsigned char *)pSource)[5]; | |
2501 | + m_pos[4] = ((unsigned char *)pSource)[4]; | |
2502 | + m_pos[3] = ((unsigned char *)pSource)[3]; | |
2503 | + m_pos[2] = ((unsigned char *)pSource)[2]; | |
2504 | + m_pos[1] = ((unsigned char *)pSource)[1]; | |
2505 | + m_pos[0] = ((unsigned char *)pSource)[0]; | |
2506 | + } | |
2507 | + m_pos += 8; | |
2508 | + break; | |
2509 | + } | |
2510 | + | |
2511 | + case typelib_TypeClass_STRING: | |
2512 | + { | |
2513 | + packString( pSource ); | |
2514 | + break; | |
2515 | + } | |
2516 | + case typelib_TypeClass_TYPE: | |
2517 | + { | |
2518 | + packType( pSource ); | |
2519 | + break; | |
2520 | + } | |
2521 | + case typelib_TypeClass_ANY: | |
2522 | + { | |
2523 | + bSuccess = packAny( pSource ); | |
2524 | + break; | |
2525 | + } | |
2526 | + case typelib_TypeClass_TYPEDEF: | |
2527 | + { | |
2528 | + bSuccess = sal_False; | |
2529 | + m_pBridgeImpl->addError( "can't handle typedef typedescriptions" ); | |
2530 | + break; | |
2531 | + } | |
2532 | + case typelib_TypeClass_INTERFACE: | |
2533 | + { | |
2534 | + remote_Interface *pRemoteI = *( remote_Interface ** )pSource; | |
2535 | + | |
2536 | + ::rtl::OUString sOid; | |
2537 | + sal_uInt16 nIndex = 0xffff; | |
2538 | + if( pRemoteI ) | |
2539 | + { | |
2540 | + m_callback( pRemoteI , &(sOid.pData) ); | |
2541 | + | |
2542 | + nIndex = m_pBridgeImpl->m_oidCacheOut.seek( sOid ); | |
2543 | + if( 0xffff == nIndex ) | |
2544 | + { | |
2545 | + nIndex = m_pBridgeImpl->m_oidCacheOut.put( sOid ); | |
2546 | + } | |
2547 | + else | |
2548 | + { | |
2549 | + // cached ! | |
2550 | + sOid = ::rtl::OUString(); | |
2551 | + } | |
2552 | + } | |
2553 | + packString( &sOid ); | |
2554 | + packInt16( &nIndex ); | |
2555 | + break; | |
2556 | + } | |
2557 | + case typelib_TypeClass_VOID: | |
2558 | + { | |
2559 | + // do nothing | |
2560 | + break; | |
2561 | + } | |
2562 | + case typelib_TypeClass_EXCEPTION: | |
2563 | + case typelib_TypeClass_STRUCT: | |
2564 | + case typelib_TypeClass_SEQUENCE: | |
2565 | + { | |
2566 | + bSuccess = packRecursive( pSource, pType ); | |
2567 | + break; | |
2568 | + } | |
2569 | + default: | |
2570 | + { | |
2571 | + bSuccess = sal_False; | |
2572 | + rtl::OUStringBuffer buf( 128 ); | |
2573 | + buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "can't handle values with typeclass " ) ); | |
2574 | + buf.append( (sal_Int32 ) pType->eTypeClass , 10 ); | |
2575 | + buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( " (" ) ); | |
2576 | + buf.append( pType->pTypeName ); | |
2577 | + buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( ")" ) ); | |
2578 | + m_pBridgeImpl->addError( buf.makeStringAndClear() ); | |
2579 | + break; | |
2580 | + } | |
2581 | + } | |
2582 | + return bSuccess; | |
2583 | +} | |
2584 | + | |
2585 | void Marshal::packOid( const ::rtl::OUString & oid ) | |
2586 | { | |
2587 | sal_uInt16 nIndex; | |
2588 | --- bridges/source/remote/urp/urp_marshal.hxx.orig 2005-09-08 00:47:30.000000000 +0200 | |
2589 | +++ bridges/source/remote/urp/urp_marshal.hxx 2006-01-16 18:55:09.976960699 +0100 | |
2590 | @@ -218,143 +224,6 @@ | |
2591 | } | |
2592 | } | |
2593 | ||
2594 | - inline sal_Bool Marshal::pack( void *pSource , typelib_TypeDescription *pType ) | |
2595 | - { | |
2596 | - sal_Bool bSuccess = sal_True; | |
2597 | - switch( pType->eTypeClass ) | |
2598 | - { | |
2599 | - case typelib_TypeClass_BYTE: | |
2600 | - { | |
2601 | - packInt8( pSource ); | |
2602 | - break; | |
2603 | - } | |
2604 | - case typelib_TypeClass_BOOLEAN: | |
2605 | - { | |
2606 | - ensureAdditionalMem( 1 ); | |
2607 | - *m_pos = ( *((sal_Bool*) pSource ) ) ? 1 : 0; | |
2608 | - m_pos++; | |
2609 | - break; | |
2610 | - } | |
2611 | - | |
2612 | - case typelib_TypeClass_CHAR: | |
2613 | - case typelib_TypeClass_SHORT: | |
2614 | - case typelib_TypeClass_UNSIGNED_SHORT: | |
2615 | - { | |
2616 | - packInt16( pSource ); | |
2617 | - break; | |
2618 | - } | |
2619 | - case typelib_TypeClass_ENUM: | |
2620 | - case typelib_TypeClass_LONG: | |
2621 | - case typelib_TypeClass_UNSIGNED_LONG: | |
2622 | - case typelib_TypeClass_FLOAT: | |
2623 | - { | |
2624 | - packInt32( pSource ); | |
2625 | - break; | |
2626 | - } | |
2627 | - case typelib_TypeClass_DOUBLE: | |
2628 | - case typelib_TypeClass_HYPER: | |
2629 | - case typelib_TypeClass_UNSIGNED_HYPER: | |
2630 | - { | |
2631 | - ensureAdditionalMem( 8 ); | |
2632 | - if( isSystemLittleEndian() ) | |
2633 | - { | |
2634 | - m_pos[0] = ((unsigned char *)pSource)[7]; | |
2635 | - m_pos[1] = ((unsigned char *)pSource)[6]; | |
2636 | - m_pos[2] = ((unsigned char *)pSource)[5]; | |
2637 | - m_pos[3] = ((unsigned char *)pSource)[4]; | |
2638 | - m_pos[4] = ((unsigned char *)pSource)[3]; | |
2639 | - m_pos[5] = ((unsigned char *)pSource)[2]; | |
2640 | - m_pos[6] = ((unsigned char *)pSource)[1]; | |
2641 | - m_pos[7] = ((unsigned char *)pSource)[0]; | |
2642 | - } | |
2643 | - else | |
2644 | - { | |
2645 | - m_pos[7] = ((unsigned char *)pSource)[7]; | |
2646 | - m_pos[6] = ((unsigned char *)pSource)[6]; | |
2647 | - m_pos[5] = ((unsigned char *)pSource)[5]; | |
2648 | - m_pos[4] = ((unsigned char *)pSource)[4]; | |
2649 | - m_pos[3] = ((unsigned char *)pSource)[3]; | |
2650 | - m_pos[2] = ((unsigned char *)pSource)[2]; | |
2651 | - m_pos[1] = ((unsigned char *)pSource)[1]; | |
2652 | - m_pos[0] = ((unsigned char *)pSource)[0]; | |
2653 | - } | |
2654 | - m_pos += 8; | |
2655 | - break; | |
2656 | - } | |
2657 | - | |
2658 | - case typelib_TypeClass_STRING: | |
2659 | - { | |
2660 | - packString( pSource ); | |
2661 | - break; | |
2662 | - } | |
2663 | - case typelib_TypeClass_TYPE: | |
2664 | - { | |
2665 | - packType( pSource ); | |
2666 | - break; | |
2667 | - } | |
2668 | - case typelib_TypeClass_ANY: | |
2669 | - { | |
2670 | - bSuccess = packAny( pSource ); | |
2671 | - break; | |
2672 | - } | |
2673 | - case typelib_TypeClass_TYPEDEF: | |
2674 | - { | |
2675 | - bSuccess = sal_False; | |
2676 | - m_pBridgeImpl->addError( "can't handle typedef typedescriptions" ); | |
2677 | - break; | |
2678 | - } | |
2679 | - case typelib_TypeClass_INTERFACE: | |
2680 | - { | |
2681 | - remote_Interface *pRemoteI = *( remote_Interface ** )pSource; | |
2682 | - | |
2683 | - ::rtl::OUString sOid; | |
2684 | - sal_uInt16 nIndex = 0xffff; | |
2685 | - if( pRemoteI ) | |
2686 | - { | |
2687 | - m_callback( pRemoteI , &(sOid.pData) ); | |
2688 | - | |
2689 | - nIndex = m_pBridgeImpl->m_oidCacheOut.seek( sOid ); | |
2690 | - if( 0xffff == nIndex ) | |
2691 | - { | |
2692 | - nIndex = m_pBridgeImpl->m_oidCacheOut.put( sOid ); | |
2693 | - } | |
2694 | - else | |
2695 | - { | |
2696 | - // cached ! | |
2697 | - sOid = ::rtl::OUString(); | |
2698 | - } | |
2699 | - } | |
2700 | - packString( &sOid ); | |
2701 | - packInt16( &nIndex ); | |
2702 | - break; | |
2703 | - } | |
2704 | - case typelib_TypeClass_VOID: | |
2705 | - { | |
2706 | - // do nothing | |
2707 | - break; | |
2708 | - } | |
2709 | - case typelib_TypeClass_EXCEPTION: | |
2710 | - case typelib_TypeClass_STRUCT: | |
2711 | - case typelib_TypeClass_SEQUENCE: | |
2712 | - { | |
2713 | - bSuccess = packRecursive( pSource, pType ); | |
2714 | - break; | |
2715 | - } | |
2716 | - default: | |
2717 | - { | |
2718 | - bSuccess = sal_False; | |
2719 | - rtl::OUStringBuffer buf( 128 ); | |
2720 | - buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "can't handle values with typeclass " ) ); | |
2721 | - buf.append( (sal_Int32 ) pType->eTypeClass , 10 ); | |
2722 | - buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( " (" ) ); | |
2723 | - buf.append( pType->pTypeName ); | |
2724 | - buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( ")" ) ); | |
2725 | - m_pBridgeImpl->addError( buf.makeStringAndClear() ); | |
2726 | - break; | |
2727 | - } | |
2728 | - } | |
2729 | - return bSuccess; | |
2730 | - } | |
2731 | } | |
2732 | ||
2733 | ||
2734 | --- bridges/source/remote/urp/urp_marshal_decl.hxx.orig 2005-09-08 00:47:44.000000000 +0200 | |
2735 | +++ bridges/source/remote/urp/urp_marshal_decl.hxx 2006-01-16 18:54:07.386834415 +0100 | |
2736 | @@ -58,7 +58,7 @@ | |
2737 | ); | |
2738 | ~Marshal( ); | |
2739 | ||
2740 | - inline sal_Bool pack( void *pSource , typelib_TypeDescription *pType ); | |
2741 | + sal_Bool pack( void *pSource , typelib_TypeDescription *pType ); | |
2742 | ||
2743 | sal_Bool packRecursive( void *pSource, typelib_TypeDescription *pType ); | |
2744 |