8000 Fix compile error on clang by goedderz · Pull Request #6884 · arangodb/arangodb · GitHub
[go: up one dir, main page]
Skip to content

Fix compile error on clang #6884

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 15, 2018
Merged

Fix compile error on clang #6884

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Fix compile error on clang
  • Loading branch information
@goedderz
goedderz committed Oct 15, 2018
commit da61fe2891241e15e5154b69cbef93d77f711f98
2 changes: 1 addition & 1 deletion 3rdParty/iresearch/core/utils/locale_utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ NS_BEGIN(std)
// std::codecvt<char16_t, char, mbstate_t>::id or std::codecvt<char32_t, char, mbstate_t>::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<char16_t, char, mbstate_t>::id;
/*static*/ template<> locale::id codecvt<char32_t, char, mbstate_t>::id;
#endif
Expand Down
0