Skip to content

Commit 83ca726

Browse files
author
Your Name
committed
mulle-sde upgrade and less warnings
1 parent a035dd5 commit 83ca726

File tree

11 files changed

+58
-51
lines changed

11 files changed

+58
-51
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required( VERSION 3.18) # 3.15 fails on windows
1+
cmake_minimum_required( VERSION 3.13...99.99) # 3.15 fails on windows
22

33
project( MulleObjC VERSION 0.26.0 LANGUAGES C)
44

cmake/share/CMakeTweaksC.cmake

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmake/share/Environment.cmake

Lines changed: 42 additions & 32 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmake/share/ExecutableObjC.cmake

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/class/MulleDynamicObject.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,8 @@ MulleObjCGenericType _MulleObjCGenericTypeOfSignature( char *signature);
135135

136136

137137

138-
MULLE_C_ALWAYS_INLINE
139-
static inline void *_MulleDynamicObjectForward( id self, SEL _cmd, void *args, int *fail)
138+
MULLE_C_STATIC_ALWAYS_INLINE
139+
void *_MulleDynamicObjectForward( id self, SEL _cmd, void *args, int *fail)
140140
{
141141
struct _mulle_objc_property *property;
142142
mulle_objc_implementation_t imp;

src/class/MulleObject-Private.h

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,10 @@ static inline void _MulleObjectUnlock( MulleObject *self)
3232
// proxied forward to. alas its not so easy, because we would have to
3333
// change more in the code above, which makes it seem not very useful
3434
//
35-
MULLE_C_ALWAYS_INLINE
36-
static inline
37-
void *MulleObjectLockingForward( MulleObject *self,
38-
mulle_objc_methodid_t methodid,
39-
void *parameter)
35+
MULLE_C_STATIC_ALWAYS_INLINE
36+
void *MulleObjectLockingForward( MulleObject *self,
37+
mulle_objc_methodid_t methodid,
38+
void *parameter)
4039
{
4140
mulle_functionpointer_t p;
4241
mulle_objc_implementation_t imp;
@@ -105,8 +104,7 @@ static inline
105104

106105

107106

108-
MULLE_C_ALWAYS_INLINE
109-
static inline
107+
MULLE_C_STATIC_ALWAYS_INLINE
110108
void *MulleObjectLockingSuperForward( MulleObject *self,
111109
mulle_objc_methodid_t methodid,
112110
void *parameter)

src/class/NSAutoreleasePool.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -209,8 +209,7 @@ static inline void NSPopAutoreleasePool( NSAutoreleasePool *pool)
209209

210210

211211
// the compiler will inline this directly
212-
MULLE_C_ALWAYS_INLINE
213-
static inline id NSAutoreleaseObject( id obj)
212+
MULLE_C_STATIC_ALWAYS_INLINEid NSAutoreleaseObject( id obj)
214213
{
215214
if( obj)
216215
_MulleObjCAutoreleaseObject( obj);

test/PROTOCOLCLASS/macro/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required( VERSION 3.14)
1+
cmake_minimum_required( VERSION 3.13...99.99)
22

33
set(CMAKE_C_COMPILER_WORKS 1)
44

test/PROTOCOLCLASS/manual/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required( VERSION 3.14)
1+
cmake_minimum_required( VERSION 3.13...99.99)
22

33
set(CMAKE_C_COMPILER_WORKS 1)
44

test/tao-mix/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ set( CMAKE_C_COMPILER_WORKS 1)
1818

1919
project( tao-mix C)
2020

21-
cmake_minimum_required( VERSION 3.11)
21+
cmake_minimum_required( VERSION 3.13...99.99)
2222

2323
set_source_files_properties( tao.m PROPERTIES COMPILE_OPTIONS "-fobjc-tao")
2424
set_source_files_properties( no-tao.m PROPERTIES COMPILE_OPTIONS "-fno-objc-tao")

0 commit comments

Comments
 (0)