Title: [160020] trunk/Source/WebKit2
- Revision
- 160020
- Author
- [email protected]
- Date
- 2013-12-03 11:36:06 -0800 (Tue, 03 Dec 2013)
Log Message
Tweak build fixes.
* Shared/APIClient.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (160019 => 160020)
--- trunk/Source/WebKit2/ChangeLog 2013-12-03 19:34:44 UTC (rev 160019)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-03 19:36:06 UTC (rev 160020)
@@ -1,3 +1,9 @@
+2013-12-03 Anders Carlsson <[email protected]>
+
+ Tweak build fixes.
+
+ * Shared/APIClient.h:
+
2013-12-03 Laszlo Vidacs <[email protected]>
Fix EFL build error in WK2 (159965)
Modified: trunk/Source/WebKit2/Shared/APIClient.h (160019 => 160020)
--- trunk/Source/WebKit2/Shared/APIClient.h 2013-12-03 19:34:44 UTC (rev 160019)
+++ trunk/Source/WebKit2/Shared/APIClient.h 2013-12-03 19:36:06 UTC (rev 160020)
@@ -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... 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
}
};
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
