diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2015-02-09 12:37:12 -0800 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2015-02-10 03:21:02 +0000 |
| commit | e024eb55c6eb4582ce22aadec440ada3c9deaab9 (patch) | |
| tree | 5f46fcf9e1ef1735c0aa00a1371ee44481fad9fc /src/3rdparty | |
| parent | 447ff9a9f32826654f9df9020610c767cb8c9b15 (diff) | |
Remove #define inline from Harfbuzz-NG
This code is C++ only. There isn't a single C++ compiler that fails to
understand the "inline" keyword, since it's required by C++98. Any
compiler older than C++98 is likely to choke on the template usage
further down, so this isn't necessary.
Moreover, the C++ standard says you cannot define macros.
[lib.macro.names] says "Nor shall such a translation unit define macros
for names lexically identical to keywords." -- technically, it's a
promise that the Standard Library headers won't do it, the wording means
that the entire translation unit won't do it, which implies no source
can do it.
MSVC complains about it:
fatal error C1189: #error : The C++ Standard Library forbids macroizing keywords. Enable warning C4005 to find the forbidden macro.
Change-Id: Ic2a0a03a0af47386e34bb698454a2040ef3f6a9d
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/harfbuzz-ng/src/hb-private.hh | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/3rdparty/harfbuzz-ng/src/hb-private.hh b/src/3rdparty/harfbuzz-ng/src/hb-private.hh index 3f70d74c26..3a4cf611f0 100644 --- a/src/3rdparty/harfbuzz-ng/src/hb-private.hh +++ b/src/3rdparty/harfbuzz-ng/src/hb-private.hh @@ -98,16 +98,6 @@ #define snprintf _snprintf #endif -#ifdef _MSC_VER -#undef inline -#define inline __inline -#endif - -#ifdef __STRICT_ANSI__ -#undef inline -#define inline __inline__ -#endif - #if __GNUC__ >= 3 #define HB_FUNC __PRETTY_FUNCTION__ #elif defined(_MSC_VER) |