diff options
author | Andres Freund <andres@anarazel.de> | 2015-08-05 18:19:52 +0200 |
---|---|---|
committer | Andres Freund <andres@anarazel.de> | 2015-08-05 18:19:52 +0200 |
commit | de6fd1c898f6eca82c2130a9dbb42d00da68d79e (patch) | |
tree | 2387db94ee7d19f19ec45dbfc31c3a6c3494a62c /src/include/utils/palloc.h | |
parent | a855118be3f0682a2061448db5a87dec50717af4 (diff) | |
download | postgresql-de6fd1c898f6eca82c2130a9dbb42d00da68d79e.tar.gz postgresql-de6fd1c898f6eca82c2130a9dbb42d00da68d79e.zip |
Rely on inline functions even if that causes warnings in older compilers.
So far we have worked around the fact that some very old compilers do
not support 'inline' functions by only using inline functions
conditionally (or not at all). Since such compilers are very rare by
now, we have decided to rely on inline functions from 9.6 onwards.
To avoid breaking these old compilers inline is defined away when not
supported. That'll cause "function x defined but not used" type of
warnings, but since nobody develops on such compilers anymore that's
ok.
This change in policy will allow us to more easily employ inline
functions.
I chose to remove code previously conditional on PG_USE_INLINE as it
seemed confusing to have code dependent on a define that's always
defined.
Blacklisting of compilers, like in c53f73879f, now has to be done
differently. A platform template can define PG_FORCE_DISABLE_INLINE to
force inline to be defined empty.
Discussion: 20150701161447.GB30708@awork2.anarazel.de
Diffstat (limited to 'src/include/utils/palloc.h')
-rw-r--r-- | src/include/utils/palloc.h | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/include/utils/palloc.h b/src/include/utils/palloc.h index e56f5014a3d..f2bcd00b4cb 100644 --- a/src/include/utils/palloc.h +++ b/src/include/utils/palloc.h @@ -98,10 +98,6 @@ extern void *MemoryContextAllocHuge(MemoryContext context, Size size); extern void *repalloc_huge(void *pointer, Size size); /* - * MemoryContextSwitchTo can't be a macro in standard C compilers. - * But we can make it an inline function if the compiler supports it. - * See STATIC_IF_INLINE in c.h. - * * Although this header file is nominally backend-only, certain frontend * programs like pg_controldata include it via postgres.h. For some compilers * it's necessary to hide the inline definition of MemoryContextSwitchTo in @@ -109,11 +105,7 @@ extern void *repalloc_huge(void *pointer, Size size); */ #ifndef FRONTEND -#ifndef PG_USE_INLINE -extern MemoryContext MemoryContextSwitchTo(MemoryContext context); -#endif /* !PG_USE_INLINE */ -#if defined(PG_USE_INLINE) || defined(MCXT_INCLUDE_DEFINITIONS) -STATIC_IF_INLINE MemoryContext +static inline MemoryContext MemoryContextSwitchTo(MemoryContext context) { MemoryContext old = CurrentMemoryContext; @@ -121,7 +113,6 @@ MemoryContextSwitchTo(MemoryContext context) CurrentMemoryContext = context; return old; } -#endif /* PG_USE_INLINE || MCXT_INCLUDE_DEFINITIONS */ #endif /* FRONTEND */ /* Registration of memory context reset/delete callbacks */ |