From f065f0d88db1644a7b015ce59f9fd16733bb0c36 Mon Sep 17 00:00:00 2001 From: jensenrichardson <61769418+jensenrichardson@users.noreply.github.com> Date: Thu, 5 Nov 2020 10:32:01 -0600 Subject: [PATCH] Update Uriparser with Intel Compiler change At some point, Intel changed __force_inline to __forceinline. Arrow does not compile without this. Source: https://software.intel.com/content/www/us/en/develop/documentation/cpp-compiler-developer-guide-and-reference/top/compiler-reference/compiler-options/compiler-option-details/inlining-options/inline-forceinline-qinline-forceinline.html --- cpp/src/arrow/vendored/uriparser/UriDefsConfig.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cpp/src/arrow/vendored/uriparser/UriDefsConfig.h b/cpp/src/arrow/vendored/uriparser/UriDefsConfig.h index 9af4968d50e..d604494b002 100644 --- a/cpp/src/arrow/vendored/uriparser/UriDefsConfig.h +++ b/cpp/src/arrow/vendored/uriparser/UriDefsConfig.h @@ -82,7 +82,8 @@ /* Intel C/C++ */ /* http://predef.sourceforge.net/precomp.html#sec20 */ /* http://www.intel.com/support/performancetools/c/windows/sb/CS-007751.htm#2 */ -# define URI_INLINE __force_inline +/* EDIT 11/5/20. Intel changed __force_inline to __forceinline */ +# define URI_INLINE __forceinline #elif defined(_MSC_VER) /* Microsoft Visual C++ */ /* http://predef.sourceforge.net/precomp.html#sec32 */