diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2022-10-31 13:44:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-31 13:44:32 +0100 |
| commit | 71e2d9ced469264cf3709beca848ac16deec8200 (patch) | |
| tree | bf88bbfc8c23052066da0005643b3ca0ba97e835 | |
| parent | 6bc45bf6b34f10ccb6fc7f1f6582d2c00f6b23f3 (diff) | |
| parent | 4db17ec554e3758aee08b78e676b3f7545f80967 (diff) | |
| download | ATCD-71e2d9ced469264cf3709beca848ac16deec8200.tar.gz | |
Merge pull request #1975 from jwillemsen/jwi-noinline
Default inlining with Embarcadero C++ Builder
| -rw-r--r-- | ACE/ace/config-win32-borland.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/ACE/ace/config-win32-borland.h b/ACE/ace/config-win32-borland.h index 5a524eaa702..096feb0eb43 100644 --- a/ACE/ace/config-win32-borland.h +++ b/ACE/ace/config-win32-borland.h @@ -17,17 +17,20 @@ #define ACE_IMPORT_SINGLETON_DECLARATION(T) template class __declspec (dllimport) T #define ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) template class __declspec (dllimport) SINGLETON_TYPE <CLASS, LOCK>; -// Default to no inlining -#if !defined (__ACE_INLINE__) -# define __ACE_INLINE__ 0 -#endif /* __ACE_INLINE__ */ +// In later versions of C++Builder we will prefer inline functions by +// default. The debug configuration of ACE is built with functions +// out-of-line, so when linking your application against a debug ACE +// build, you can choose to use the out-of-line functions by adding +// ACE_NO_INLINE=1 to your project settings. +# if !defined (__ACE_INLINE__) +# define __ACE_INLINE__ 1 +# endif /* __ACE_INLINE__ */ #define ACE_CC_NAME ACE_TEXT ("Embarcadero C++ Builder") #define ACE_CC_MAJOR_VERSION (__BORLANDC__ / 0x100) #define ACE_CC_MINOR_VERSION (__BORLANDC__ % 0x100) #define ACE_CC_BETA_VERSION (0) - #if !defined (WIN32) # if defined (__WIN32__) || defined (_WIN32) # define WIN32 1 |