From 89b15b40e3a2565b11f15e26dc2844bb580c446b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobias=20G=C3=B6dderz?= Date: Mon, 15 Oct 2018 14:58:36 +0200 Subject: [PATCH] Fix compile error on clang (#6883) --- 3rdParty/iresearch/core/utils/locale_utils.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3rdParty/iresearch/core/utils/locale_utils.cpp b/3rdParty/iresearch/core/utils/locale_utils.cpp index d8477de831..61bce4b009 100644 --- a/3rdParty/iresearch/core/utils/locale_utils.cpp +++ b/3rdParty/iresearch/core/utils/locale_utils.cpp @@ -87,7 +87,7 @@ NS_BEGIN(std) // std::codecvt::id or std::codecvt::id // this causes linking issues in optimized code // Note: clang tries to pretend to be GCC, so it must be explicitly excluded -#if !defined(__APPLE__) && defined(__GNUC__) && (__GNUC__ < 5) +#if !defined(__APPLE__) && !defined(__clang__) && defined(__GNUC__) && (__GNUC__ < 5) /*static*/ template<> locale::id codecvt::id; /*static*/ template<> locale::id codecvt::id; #endif