<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[160561] trunk/Source/WTF</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/160561">160561</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2013-12-13 13:36:39 -0800 (Fri, 13 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Require variadic templates to build WebKit
https://bugs.webkit.org/show_bug.cgi?id=125701
Reviewed by Andreas Kling.
* wtf/Compiler.h:
Add an #error if variadic templates are disabled.
* wtf/NeverDestroyed.h:
* wtf/PassRef.h:
* wtf/StdLibExtras.h:
Remove a bunch of COMPILER_SUPPORTS(CXX_VARIADIC_TEMPLATES) #ifdefs.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfCompilerh">trunk/Source/WTF/wtf/Compiler.h</a></li>
<li><a href="#trunkSourceWTFwtfNeverDestroyedh">trunk/Source/WTF/wtf/NeverDestroyed.h</a></li>
<li><a href="#trunkSourceWTFwtfPassRefh">trunk/Source/WTF/wtf/PassRef.h</a></li>
<li><a href="#trunkSourceWTFwtfStdLibExtrash">trunk/Source/WTF/wtf/StdLibExtras.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (160560 => 160561)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2013-12-13 21:26:07 UTC (rev 160560)
+++ trunk/Source/WTF/ChangeLog 2013-12-13 21:36:39 UTC (rev 160561)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2013-12-13 Anders Carlsson <andersca@apple.com>
+
+ Require variadic templates to build WebKit
+ https://bugs.webkit.org/show_bug.cgi?id=125701
+
+ Reviewed by Andreas Kling.
+
+ * wtf/Compiler.h:
+ Add an #error if variadic templates are disabled.
+
+ * wtf/NeverDestroyed.h:
+ * wtf/PassRef.h:
+ * wtf/StdLibExtras.h:
+ Remove a bunch of COMPILER_SUPPORTS(CXX_VARIADIC_TEMPLATES) #ifdefs.
+
</ins><span class="cx"> 2013-12-13 Peter Szanka <h868064@stud.u-szeged.hu>
</span><span class="cx">
</span><span class="cx"> Delete INTEL C compiler related code parts.
</span></span></pre></div>
<a id="trunkSourceWTFwtfCompilerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Compiler.h (160560 => 160561)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Compiler.h 2013-12-13 21:26:07 UTC (rev 160560)
+++ trunk/Source/WTF/wtf/Compiler.h 2013-12-13 21:36:39 UTC (rev 160561)
</span><span class="lines">@@ -201,7 +201,10 @@
</span><span class="cx"> #if !COMPILER_SUPPORTS(CXX_AUTO_TYPE)
</span><span class="cx"> #error "Please use a compiler that supports C++11 auto."
</span><span class="cx"> #endif
</span><ins>+#if !COMPILER_SUPPORTS(CXX_VARIADIC_TEMPLATES)
+#error "Please use a compiler that supports C++11 variadic templates."
</ins><span class="cx"> #endif
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> /* PURE_FUNCTION */
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFwtfNeverDestroyedh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/NeverDestroyed.h (160560 => 160561)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/NeverDestroyed.h 2013-12-13 21:26:07 UTC (rev 160560)
+++ trunk/Source/WTF/wtf/NeverDestroyed.h 2013-12-13 21:36:39 UTC (rev 160561)
</span><span class="lines">@@ -46,25 +46,12 @@
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(NeverDestroyed);
</span><span class="cx">
</span><span class="cx"> public:
</span><del>-#if COMPILER_SUPPORTS(CXX_VARIADIC_TEMPLATES)
</del><span class="cx"> template<typename... Args>
</span><span class="cx"> NeverDestroyed(Args&&... args)
</span><span class="cx"> {
</span><span class="cx"> new (asPtr()) T(std::forward<Args>(args)...);
</span><span class="cx"> }
</span><del>-#else
- NeverDestroyed()
- {
- new (NotNull, asPtr()) T;
- }
</del><span class="cx">
</span><del>- template<typename A1>
- NeverDestroyed(A1&& a1)
- {
- new (NotNull, asPtr()) T(std::forward<A1>(a1));
- }
-#endif
-
</del><span class="cx"> operator T&() { return *asPtr(); }
</span><span class="cx"> T& get() { return *asPtr(); }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFwtfPassRefh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/PassRef.h (160560 => 160561)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/PassRef.h 2013-12-13 21:26:07 UTC (rev 160560)
+++ trunk/Source/WTF/wtf/PassRef.h 2013-12-13 21:36:39 UTC (rev 160561)
</span><span class="lines">@@ -148,72 +148,11 @@
</span><span class="cx"> return PassRef<T>(reference, PassRef<T>::Adopt);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if COMPILER_SUPPORTS(CXX_VARIADIC_TEMPLATES)
-
</del><span class="cx"> template<typename T, typename... Args> inline PassRef<T> createRefCounted(Args&&... args)
</span><span class="cx"> {
</span><span class="cx"> return adoptRef(*new T(std::forward<Args>(args)...));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#else
-
-template<typename T> inline PassRef<T> createRefCounted()
-{
- return adoptRef(*new T);
-}
-
-template<typename T, typename A1> inline PassRef<T> createRefCounted(A1&& a1)
-{
- return adoptRef(*new T(std::forward<A1>(a1)));
-}
-
-template<typename T, typename A1, typename A2> inline PassRef<T> createRefCounted(A1&& a1, A2&& a2)
-{
- return adoptRef(*new T(std::forward<A1>(a1), std::forward<A2>(a2)));
-}
-
-template<typename T, typename A1, typename A2, typename A3> inline PassRef<T> createRefCounted(A1&& a1, A2&& a2, A3&& a3)
-{
- return adoptRef(*new T(std::forward<A1>(a1), std::forward<A2>(a2), std::forward<A3>(a3)));
-}
-
-template<typename T, typename A1, typename A2, typename A3, typename A4> inline PassRef<T> createRefCounted(A1&& a1, A2&& a2, A3&& a3, A4&& a4)
-{
- return adoptRef(*new T(std::forward<A1>(a1), std::forward<A2>(a2), std::forward<A3>(a3), std::forward<A4>(a4)));
-}
-
-template<typename T, typename A1, typename A2, typename A3, typename A4, typename A5> inline PassRef<T> createRefCounted(A1&& a1, A2&& a2, A3&& a3, A4&& a4, A5&& a5)
-{
- return adoptRef(*new T(std::forward<A1>(a1), std::forward<A2>(a2), std::forward<A3>(a3), std::forward<A4>(a4), std::forward<A5>(a5)));
-}
-
-template<typename T, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6> inline PassRef<T> createRefCounted(A1&& a1, A2&& a2, A3&& a3, A4&& a4, A5&& a5, A6&& a6)
-{
- return adoptRef(*new T(std::forward<A1>(a1), std::forward<A2>(a2), std::forward<A3>(a3), std::forward<A4>(a4), std::forward<A5>(a5), std::forward<A6>(a6)));
-}
-
-template<typename T, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7> inline PassRef<T> createRefCounted(A1&& a1, A2&& a2, A3&& a3, A4&& a4, A5&& a5, A6&& a6, A7&& a7)
-{
- return adoptRef(*new T(std::forward<A1>(a1), std::forward<A2>(a2), std::forward<A3>(a3), std::forward<A4>(a4), std::forward<A5>(a5), std::forward<A6>(a6), std::forward<A7>(a7)));
-}
-
-template<typename T, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8> inline PassRef<T> createRefCounted(A1&& a1, A2&& a2, A3&& a3, A4&& a4, A5&& a5, A6&& a6, A7&& a7, A8&& a8)
-{
- return adoptRef(*new T(std::forward<A1>(a1), std::forward<A2>(a2), std::forward<A3>(a3), std::forward<A4>(a4), std::forward<A5>(a5), std::forward<A6>(a6), std::forward<A7>(a7), std::forward<A8>(a8)));
-}
-
-template<typename T, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9> inline PassRef<T> createRefCounted(A1&& a1, A2&& a2, A3&& a3, A4&& a4, A5&& a5, A6&& a6, A7&& a7, A8&& a8, A9&& a9)
-{
- return adoptRef(*new T(std::forward<A1>(a1), std::forward<A2>(a2), std::forward<A3>(a3), std::forward<A4>(a4), std::forward<A5>(a5), std::forward<A6>(a6), std::forward<A7>(a7), std::forward<A8>(a8), std::forward<A9>(a9)));
-}
-
-template<typename T, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9, typename A10> inline PassRef<T> createRefCounted(A1&& a1, A2&& a2, A3&& a3, A4&& a4, A5&& a5, A6&& a6, A7&& a7, A8&& a8, A9&& a9, A10&& a10)
-{
- return adoptRef(*new T(std::forward<A1>(a1), std::forward<A2>(a2), std::forward<A3>(a3), std::forward<A4>(a4), std::forward<A5>(a5), std::forward<A6>(a6), std::forward<A7>(a7), std::forward<A8>(a8), std::forward<A9>(a9), std::forward<A10>(a10)));
-}
-
-#endif
-
</del><span class="cx"> } // namespace WTF
</span><span class="cx">
</span><span class="cx"> using WTF::PassRef;
</span></span></pre></div>
<a id="trunkSourceWTFwtfStdLibExtrash"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/StdLibExtras.h (160560 => 160561)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/StdLibExtras.h 2013-12-13 21:26:07 UTC (rev 160560)
+++ trunk/Source/WTF/wtf/StdLibExtras.h 2013-12-13 21:36:39 UTC (rev 160561)
</span><span class="lines">@@ -322,6 +322,8 @@
</span><span class="cx">
</span><span class="cx"> // This adds various C++14 features for versions of the STL that may not yet have them.
</span><span class="cx"> namespace std {
</span><ins>+// MSVC 2013 supports std::make_unique already.
+#if !defined(_MSC_VER) || _MSC_VER < 1800
</ins><span class="cx"> template<class T> struct _Unique_if {
</span><span class="cx"> typedef unique_ptr<T> _Single_object;
</span><span class="cx"> };
</span><span class="lines">@@ -334,97 +336,23 @@
</span><span class="cx"> typedef void _Known_bound;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-#if COMPILER_SUPPORTS(CXX_VARIADIC_TEMPLATES)
-#if !defined(_MSC_VER) || _MSC_VER < 1800
</del><span class="cx"> template<class T, class... Args> inline typename _Unique_if<T>::_Single_object
</span><span class="cx"> make_unique(Args&&... args)
</span><span class="cx"> {
</span><span class="cx"> return unique_ptr<T>(new T(std::forward<Args>(args)...));
</span><span class="cx"> }
</span><del>-#endif
-#else
- template<class T> inline typename _Unique_if<T>::_Single_object
- make_unique()
- {
- return unique_ptr<T>(new T);
- }
</del><span class="cx">
</span><del>- template<class T, class A1> inline typename _Unique_if<T>::_Single_object
- make_unique(A1&& a1)
- {
- return unique_ptr<T>(new T(std::forward<A1>(a1)));
- }
-
- template<class T, class A1, class A2> inline typename _Unique_if<T>::_Single_object
- make_unique(A1&& a1, A2&& a2)
- {
- return unique_ptr<T>(new T(std::forward<A1>(a1), std::forward<A2>(a2)));
- }
-
- template<class T, class A1, class A2, class A3> inline typename _Unique_if<T>::_Single_object
- make_unique(A1&& a1, A2&& a2, A3&& a3)
- {
- return unique_ptr<T>(new T(std::forward<A1>(a1), std::forward<A2>(a2), std::forward<A3>(a3)));
- }
-
- template<class T, class A1, class A2, class A3, class A4> inline typename _Unique_if<T>::_Single_object
- make_unique(A1&& a1, A2&& a2, A3&& a3, A4&& a4)
- {
- return unique_ptr<T>(new T(std::forward<A1>(a1), std::forward<A2>(a2), std::forward<A3>(a3), std::forward<A4>(a4)));
- }
-
- template<class T, class A1, class A2, class A3, class A4, class A5> inline typename _Unique_if<T>::_Single_object
- make_unique(A1&& a1, A2&& a2, A3&& a3, A4&& a4, A5&& a5)
- {
- return unique_ptr<T>(new T(std::forward<A1>(a1), std::forward<A2>(a2), std::forward<A3>(a3), std::forward<A4>(a4), std::forward<A5>(a5)));
- }
-
- template<class T, class A1, class A2, class A3, class A4, class A5, class A6> inline typename _Unique_if<T>::_Single_object
- make_unique(A1&& a1, A2&& a2, A3&& a3, A4&& a4, A5&& a5, A6&& a6)
- {
- return unique_ptr<T>(new T(std::forward<A1>(a1), std::forward<A2>(a2), std::forward<A3>(a3), std::forward<A4>(a4), std::forward<A5>(a5), std::forward<A6>(a6)));
- }
-
- template<class T, class A1, class A2, class A3, class A4, class A5, class A6, class A7> inline typename _Unique_if<T>::_Single_object
- make_unique(A1&& a1, A2&& a2, A3&& a3, A4&& a4, A5&& a5, A6&& a6, A7&& a7)
- {
- return unique_ptr<T>(new T(std::forward<A1>(a1), std::forward<A2>(a2), std::forward<A3>(a3), std::forward<A4>(a4), std::forward<A5>(a5), std::forward<A6>(a6), std::forward<A7>(a7)));
- }
-
- template<class T, class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8> inline typename _Unique_if<T>::_Single_object
- make_unique(A1&& a1, A2&& a2, A3&& a3, A4&& a4, A5&& a5, A6&& a6, A7&& a7, A8&& a8)
- {
- return unique_ptr<T>(new T(std::forward<A1>(a1), std::forward<A2>(a2), std::forward<A3>(a3), std::forward<A4>(a4), std::forward<A5>(a5), std::forward<A6>(a6), std::forward<A7>(a7), std::forward<A8>(a8)));
- }
-
- template<class T, class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8, class A9> inline typename _Unique_if<T>::_Single_object
- make_unique(A1&& a1, A2&& a2, A3&& a3, A4&& a4, A5&& a5, A6&& a6, A7&& a7, A8&& a8, A9&& a9)
- {
- return unique_ptr<T>(new T(std::forward<A1>(a1), std::forward<A2>(a2), std::forward<A3>(a3), std::forward<A4>(a4), std::forward<A5>(a5), std::forward<A6>(a6), std::forward<A7>(a7), std::forward<A8>(a8), std::forward<A9>(a9)));
- }
-
- template<class T, class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8, class A9, class A10> inline typename _Unique_if<T>::_Single_object
- make_unique(A1&& a1, A2&& a2, A3&& a3, A4&& a4, A5&& a5, A6&& a6, A7&& a7, A8&& a8, A9&& a9, A10&& a10)
- {
- return unique_ptr<T>(new T(std::forward<A1>(a1), std::forward<A2>(a2), std::forward<A3>(a3), std::forward<A4>(a4), std::forward<A5>(a5), std::forward<A6>(a6), std::forward<A7>(a7), std::forward<A8>(a8), std::forward<A9>(a9), std::forward<A10>(a10)));
- }
-#endif
-
-#if !defined(_MSC_VER) || _MSC_VER < 1800
</del><span class="cx"> template<class T> inline typename _Unique_if<T>::_Unknown_bound
</span><span class="cx"> make_unique(size_t n)
</span><span class="cx"> {
</span><span class="cx"> typedef typename remove_extent<T>::type U;
</span><span class="cx"> return unique_ptr<T>(new U[n]());
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><del>-#if COMPILER_SUPPORTS(CXX_VARIADIC_TEMPLATES)
</del><span class="cx"> template<class T, class... Args> typename _Unique_if<T>::_Known_bound
</span><span class="cx"> make_unique(Args&&...) = delete;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if COMPILER_SUPPORTS(CXX_VARIADIC_TEMPLATES)
</del><span class="cx"> // Compile-time integer sequences
</span><span class="cx"> // http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2013/n3658.html
</span><span class="cx"> // (Note that we only implement index_sequence, and not the more generic integer_sequence).
</span><span class="lines">@@ -443,7 +371,6 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template<size_t length> struct make_index_sequence : public make_index_sequence_helper<length>::type { };
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> using WTF::KB;
</span></span></pre>
</div>
</div>
</body>
</html>