Skip to content

Commit 3478705

Browse files
author
Nat!
committed
use new mulle-c11 macro MULLE_C_STATIC_ALWAYS_INLINE to fix _WIN32 warnings
1 parent fabb8fc commit 3478705

14 files changed

+135
-125
lines changed

‎src/mulle-objc-builtin.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -226,8 +226,8 @@ static inline void
226226
}
227227
}
228228

229-
MULLE_C_ALWAYS_INLINE
230-
static void *
229+
MULLE_C_STATIC_ALWAYS_INLINE
230+
void *
231231
mulle_objc_object_get_property_value( void *self,
232232
mulle_objc_methodid_t _cmd,
233233
ptrdiff_t offset,

‎src/mulle-objc-cache.h‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,8 @@ static inline mulle_objc_cache_uint_t
162162
}
163163

164164

165-
MULLE_C_ALWAYS_INLINE static struct _mulle_objc_cache *
165+
MULLE_C_STATIC_ALWAYS_INLINE
166+
struct _mulle_objc_cache *
166167
_mulle_objc_cacheentry_get_cache_from_entries( struct _mulle_objc_cacheentry *entries)
167168
{
168169
return( (void *) &((char *) entries)[ -(int) offsetof( struct _mulle_objc_cache, entries)]);
@@ -347,16 +348,16 @@ struct _mulle_objc_cachepivot
347348
};
348349

349350

350-
MULLE_C_ALWAYS_INLINE
351-
static struct _mulle_objc_cacheentry *
351+
MULLE_C_STATIC_ALWAYS_INLINE
352+
struct _mulle_objc_cacheentry *
352353
_mulle_objc_cachepivot_get_entries_nonatomic( struct _mulle_objc_cachepivot *p)
353354
{
354355
return( _mulle_atomic_pointer_read_nonatomic( &p->entries));
355356
}
356357

357358

358-
MULLE_C_ALWAYS_INLINE
359-
static struct _mulle_objc_cache *
359+
MULLE_C_STATIC_ALWAYS_INLINE
360+
struct _mulle_objc_cache *
360361
_mulle_objc_cachepivot_get_cache_nonatomic( struct _mulle_objc_cachepivot *p)
361362
{
362363
struct _mulle_objc_cacheentry *entries;
@@ -366,8 +367,8 @@ static struct _mulle_objc_cache *
366367
}
367368

368369

369-
MULLE_C_ALWAYS_INLINE
370-
static struct _mulle_objc_cacheentry *
370+
MULLE_C_STATIC_ALWAYS_INLINE
371+
struct _mulle_objc_cacheentry *
371372
_mulle_objc_cachepivot_get_entries_atomic( struct _mulle_objc_cachepivot *p)
372373
{
373374
return( (void *) _mulle_atomic_pointer_read( &p->entries));

‎src/mulle-objc-call.h‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ void mulle_objc_implementation_debug( mulle_objc_implementation_t imp,
103103
}
104104

105105

106-
MULLE_C_ALWAYS_INLINE
107-
static void *
106+
MULLE_C_STATIC_ALWAYS_INLINE
107+
void *
108108
_mulle_objc_implementation_invoke( mulle_objc_implementation_t imp,
109109
void *self,
110110
mulle_objc_methodid_t sel,
@@ -115,8 +115,8 @@ static void *
115115

116116

117117

118-
MULLE_C_ALWAYS_INLINE
119-
static void *
118+
MULLE_C_STATIC_ALWAYS_INLINE
119+
void *
120120
mulle_objc_implementation_invoke( mulle_objc_implementation_t imp,
121121
void *self,
122122
mulle_objc_methodid_t sel,
@@ -161,7 +161,7 @@ void *_mulle_objc_object_call( void *obj,
161161
//
162162
// use this for -O -O2
163163
//
164-
MULLE_C_ALWAYS_INLINE static void *
164+
MULLE_C_STATIC_ALWAYS_INLINE void *
165165
mulle_objc_object_call_inline_minimal( void *obj,
166166
mulle_objc_methodid_t methodid,
167167
void *parameter)
@@ -175,8 +175,8 @@ MULLE_C_ALWAYS_INLINE static void *
175175

176176
#ifdef __MULLE_OBJC_FCS__
177177

178-
MULLE_C_ALWAYS_INLINE
179-
static void *
178+
MULLE_C_STATIC_ALWAYS_INLINE
179+
void *
180180
_mulle_objc_fastmethodtable_get_imp( struct _mulle_objc_fastmethodtable *table,
181181
unsigned int index)
182182
{
@@ -187,8 +187,8 @@ static void *
187187
}
188188

189189

190-
MULLE_C_ALWAYS_INLINE
191-
static void *
190+
MULLE_C_STATIC_ALWAYS_INLINE
191+
void *
192192
_mulle_objc_fastmethodtable_invoke( void *obj,
193193
mulle_objc_methodid_t methodid,
194194
void *param,
@@ -208,8 +208,8 @@ static void *
208208
// use this for -O3. -O3 is the cmake default. But the "full" inline
209209
// is a bit much for default release IMO
210210
//
211-
MULLE_C_ALWAYS_INLINE
212-
static void *
211+
MULLE_C_STATIC_ALWAYS_INLINE
212+
void *
213213
mulle_objc_object_call_inline_partial( void *obj,
214214
mulle_objc_methodid_t methodid,
215215
void *parameter)
@@ -253,8 +253,8 @@ static void *
253253
// use this for -fobjc-inline-method-calls=0 == none
254254
//
255255
//
256-
MULLE_C_ALWAYS_INLINE
257-
static void *
256+
MULLE_C_STATIC_ALWAYS_INLINE
257+
void *
258258
_mulle_objc_object_call_inline( void *obj,
259259
mulle_objc_methodid_t methodid,
260260
void *parameter)
@@ -308,8 +308,8 @@ static void *
308308
}
309309

310310

311-
MULLE_C_ALWAYS_INLINE
312-
static void *
311+
MULLE_C_STATIC_ALWAYS_INLINE
312+
void *
313313
mulle_objc_object_call_inline( void *obj,
314314
mulle_objc_methodid_t methodid,
315315
void *parameter)
@@ -321,8 +321,8 @@ static void *
321321
}
322322

323323

324-
MULLE_C_ALWAYS_INLINE
325-
static void *
324+
MULLE_C_STATIC_ALWAYS_INLINE
325+
void *
326326
_mulle_objc_object_get_imp_inline_full_no_fcs( void *obj,
327327
mulle_objc_methodid_t methodid)
328328
{
@@ -379,8 +379,8 @@ static void *
379379
// code to the inlined function, you might or might not deep acceptable. So
380380
// if we miss the cache, we got to call_cache_miss.
381381
//
382-
MULLE_C_ALWAYS_INLINE
383-
static void *
382+
MULLE_C_STATIC_ALWAYS_INLINE
383+
void *
384384
_mulle_objc_object_call_inline_full( void *obj,
385385
mulle_objc_methodid_t methodid,
386386
void *parameter)
@@ -443,8 +443,8 @@ static void *
443443
}
444444

445445

446-
MULLE_C_ALWAYS_INLINE
447-
static void *
446+
MULLE_C_STATIC_ALWAYS_INLINE
447+
void *
448448
mulle_objc_object_call_inline_full( void *obj,
449449
mulle_objc_methodid_t methodid,
450450
void *parameter)
@@ -461,7 +461,7 @@ static void *
461461
// do or attempt FCS, which would be too slow if the selector is not a
462462
// constant.
463463
//
464-
MULLE_C_ALWAYS_INLINE static void *
464+
MULLE_C_STATIC_ALWAYS_INLINE void *
465465
mulle_objc_object_call_variable_inline( void *obj,
466466
mulle_objc_methodid_t methodid,
467467
void *parameter)
@@ -508,7 +508,7 @@ MULLE_C_ALWAYS_INLINE static void *
508508
// do or attempt FCS, which would be too slow if the selector is not a
509509
// constant.
510510
//
511-
MULLE_C_ALWAYS_INLINE static void *
511+
MULLE_C_STATIC_ALWAYS_INLINE void *
512512
mulle_objc_object_call_inline_full_variable( void *obj,
513513
mulle_objc_methodid_t methodid,
514514
void *parameter)
@@ -561,7 +561,7 @@ MULLE_C_ALWAYS_INLINE static void *
561561
// this is just an alias for mulle_objc_object_call, there is no difference
562562
// in code/semantics
563563
//
564-
MULLE_C_ALWAYS_INLINE static
564+
MULLE_C_STATIC_ALWAYS_INLINE
565565
void *mulle_objc_object_call_variable( void *obj,
566566
mulle_objc_methodid_t methodid,
567567
void *parameter)
@@ -582,8 +582,8 @@ void *mulle_objc_object_call_super( void *obj,
582582

583583

584584

585-
MULLE_C_ALWAYS_INLINE
586-
static void *
585+
MULLE_C_STATIC_ALWAYS_INLINE
586+
void *
587587
mulle_objc_object_call_super_inline_partial( void *obj,
588588
mulle_objc_methodid_t methodid,
589589
void *parameter,
@@ -607,7 +607,7 @@ static void *
607607

608608

609609

610-
MULLE_C_ALWAYS_INLINE static void *
610+
MULLE_C_STATIC_ALWAYS_INLINE void *
611611
mulle_objc_object_call_super_inline( void *obj,
612612
mulle_objc_methodid_t methodid,
613613
void *parameter,
@@ -659,7 +659,7 @@ MULLE_C_ALWAYS_INLINE static void *
659659
}
660660

661661

662-
MULLE_C_ALWAYS_INLINE static void *
662+
MULLE_C_STATIC_ALWAYS_INLINE void *
663663
mulle_objc_object_call_super_inline_full( void *obj,
664664
mulle_objc_methodid_t methodid,
665665
void *parameter,

‎src/mulle-objc-class-impcache.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@
4343

4444

4545

46-
MULLE_C_ALWAYS_INLINE
46+
MULLE_C_STATIC_ALWAYS_INLINE
4747
MULLE_C_NONNULL_FIRST
4848
MULLE_C_NONNULL_RETURN
49-
static inline struct _mulle_objc_cache *
49+
struct _mulle_objc_cache *
5050
_mulle_objc_class_get_impcache_cache_atomic( struct _mulle_objc_class *cls)
5151
{
5252
struct _mulle_objc_cacheentry *entries;
@@ -61,10 +61,10 @@ static inline struct _mulle_objc_cache *
6161
}
6262

6363

64-
MULLE_C_ALWAYS_INLINE
64+
MULLE_C_STATIC_ALWAYS_INLINE
6565
MULLE_C_NONNULL_FIRST
6666
MULLE_C_NONNULL_RETURN
67-
static inline struct _mulle_objc_impcache *
67+
struct _mulle_objc_impcache *
6868
_mulle_objc_class_get_impcache_atomic( struct _mulle_objc_class *cls)
6969
{
7070
struct _mulle_objc_cache *cache;

‎src/mulle-objc-class-lookup.c‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,12 +75,11 @@ enum
7575
//
7676
// updates the cache, no forward
7777
//
78-
MULLE_C_ALWAYS_INLINE
79-
static
80-
mulle_objc_implementation_t
81-
_mulle_objc_class_lookup_implementation_mode( struct _mulle_objc_class *cls,
82-
mulle_objc_methodid_t methodid,
83-
unsigned int mode)
78+
MULLE_C_STATIC_ALWAYS_INLINE
79+
mulle_objc_implementation_t
80+
_mulle_objc_class_lookup_implementation_mode( struct _mulle_objc_class *cls,
81+
mulle_objc_methodid_t methodid,
82+
unsigned int mode)
8483
{
8584
struct _mulle_objc_method *method;
8685
mulle_objc_implementation_t imp;

‎src/mulle-objc-class-lookup.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@
5151
#pragma mark - cache support
5252

5353

54-
MULLE_C_ALWAYS_INLINE
55-
static struct _mulle_objc_cacheentry *
54+
MULLE_C_STATIC_ALWAYS_INLINE
55+
struct _mulle_objc_cacheentry *
5656
_mulle_objc_class_probe_cacheentry_inline( struct _mulle_objc_class *cls,
5757
mulle_objc_superid_t methodid)
5858
{
@@ -81,8 +81,8 @@ static struct _mulle_objc_cacheentry *
8181
}
8282

8383

84-
MULLE_C_ALWAYS_INLINE
85-
static mulle_objc_implementation_t
84+
MULLE_C_STATIC_ALWAYS_INLINE
85+
mulle_objc_implementation_t
8686
_mulle_objc_class_probe_implementation_inline( struct _mulle_objc_class *cls,
8787
mulle_objc_superid_t methodid)
8888
{

‎src/mulle-objc-fastclasstable.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ static inline struct _mulle_objc_infraclass *
7272

7373

7474

75-
MULLE_C_CONST_NONNULL_RETURN MULLE_C_ALWAYS_INLINE
76-
static struct _mulle_objc_infraclass *
75+
MULLE_C_CONST_NONNULL_RETURN MULLE_C_STATIC_ALWAYS_INLINE
76+
struct _mulle_objc_infraclass *
7777
mulle_objc_fastclasstable_get_infraclass_nofail( struct _mulle_objc_fastclasstable *table,
7878
unsigned int i)
7979
{
@@ -100,8 +100,8 @@ static struct _mulle_objc_infraclass *
100100
// classes. IMO. Obvious candidates are all the small clases, NSData, NSString
101101
// an obvious non-candidate would be NSFileManager.
102102
//
103-
MULLE_C_CONST_RETURN MULLE_C_ALWAYS_INLINE
104-
static int mulle_objc_get_fastclasstable_index( mulle_objc_classid_t classid)
103+
MULLE_C_CONST_RETURN MULLE_C_STATIC_ALWAYS_INLINE
104+
int mulle_objc_get_fastclasstable_index( mulle_objc_classid_t classid)
105105
{
106106
switch( classid)
107107
{

‎src/mulle-objc-fastmethodtable.h‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,9 @@ static inline void _mulle_objc_fastmethodtable_done( struct _mulle_objc_fastm
8383
//
8484
// TODO: reexamine in real-life usage later on.
8585
//
86-
MULLE_C_CONST_RETURN MULLE_C_ALWAYS_INLINE
87-
static int mulle_objc_get_fastmethodtable_index( mulle_objc_methodid_t methodid)
86+
MULLE_C_CONST_RETURN
87+
MULLE_C_STATIC_ALWAYS_INLINE
88+
int mulle_objc_get_fastmethodtable_index( mulle_objc_methodid_t methodid)
8889
{
8990
switch( methodid)
9091
{

0 commit comments

Comments
 (0)