Commit 75c5c6e6 authored by andersca@apple.com's avatar andersca@apple.com

Tweak build fixes.

* Shared/APIClient.h:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@160020 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent f1ae6548
2013-12-03 Anders Carlsson <andersca@apple.com>
Tweak build fixes.
* Shared/APIClient.h:
2013-12-03 Laszlo Vidacs <lac@inf.u-szeged.hu>
Fix EFL build error in WK2 (159965)
......
......@@ -27,12 +27,9 @@
#define APIClient_h
#include "APIClientTraits.h"
#include <algorithm>
#include <array>
#if !ASSERT_DISABLED
#include <algorithm> // std::is_sorted
#endif
// FIXME: Transition all clients from WebKit::APIClient to API::Client.
namespace API {
......@@ -48,15 +45,7 @@ template<typename ClientInterface> class Client {
template<typename... Interfaces> struct InterfaceSizes<std::tuple<Interfaces...>> {
static std::array<size_t, sizeof...(Interfaces)> sizes()
{
#if COMPILER(CLANG)
// Workaround for http://llvm.org/bugs/show_bug.cgi?id=18117
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wmissing-braces"
#endif
return { { sizeof(Interfaces)... } };
#if COMPILER(CLANG)
#pragma clang diagnostic pop
#endif
}
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment