Modified: trunk/Source/_javascript_Core/ChangeLog (102838 => 102839)
--- trunk/Source/_javascript_Core/ChangeLog 2011-12-14 23:50:35 UTC (rev 102838)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-12-14 23:55:12 UTC (rev 102839)
@@ -1,3 +1,15 @@
+2011-12-14 Anders Carlsson <[email protected]>
+
+ Work around a bug in the MSVC2005 compiler
+ https://bugs.webkit.org/show_bug.cgi?id=74550
+
+ Reviewed by Sam Weinig.
+
+ Add template parameters for the return types of the partial specializations of BoundFunctionImpl.
+
+ * wtf/Functional.h:
+ (WTF::R):
+
2011-12-13 Jon Lee <[email protected]>
Enable notifications on Mac.
Modified: trunk/Source/_javascript_Core/wtf/Functional.h (102838 => 102839)
--- trunk/Source/_javascript_Core/wtf/Functional.h 2011-12-14 23:50:35 UTC (rev 102838)
+++ trunk/Source/_javascript_Core/wtf/Functional.h 2011-12-14 23:55:12 UTC (rev 102839)
@@ -149,14 +149,14 @@
template<typename FunctionWrapper, typename FunctionType>
class BoundFunctionImpl;
-template<typename FunctionWrapper> class BoundFunctionImpl<FunctionWrapper, typename FunctionWrapper::ResultType ()> : public FunctionImpl<typename FunctionWrapper::ResultType ()> {
+template<typename FunctionWrapper, typename R> class BoundFunctionImpl<FunctionWrapper, R ()> : public FunctionImpl<typename FunctionWrapper::ResultType ()> {
public:
explicit BoundFunctionImpl(FunctionWrapper functionWrapper)
: m_functionWrapper(functionWrapper)
{
}
- virtual typename FunctionWrapper::ResultType operator()()
+ virtual R operator()()
{
return m_functionWrapper();
}
@@ -165,7 +165,7 @@
FunctionWrapper m_functionWrapper;
};
-template<typename FunctionWrapper, typename P0> class BoundFunctionImpl<FunctionWrapper, typename FunctionWrapper::ResultType (P0)> : public FunctionImpl<typename FunctionWrapper::ResultType ()> {
+template<typename FunctionWrapper, typename R, typename P0> class BoundFunctionImpl<FunctionWrapper, R (P0)> : public FunctionImpl<typename FunctionWrapper::ResultType ()> {
public:
BoundFunctionImpl(FunctionWrapper functionWrapper, const P0& p0)
@@ -174,7 +174,7 @@
{
}
- virtual typename FunctionWrapper::ResultType operator()()
+ virtual R operator()()
{
return m_functionWrapper(m_p0);
}
@@ -184,7 +184,7 @@
P0 m_p0;
};
-template<typename FunctionWrapper, typename P0, typename P1> class BoundFunctionImpl<FunctionWrapper, typename FunctionWrapper::ResultType (P0, P1)> : public FunctionImpl<typename FunctionWrapper::ResultType ()> {
+template<typename FunctionWrapper, typename R, typename P0, typename P1> class BoundFunctionImpl<FunctionWrapper, R (P0, P1)> : public FunctionImpl<typename FunctionWrapper::ResultType ()> {
public:
BoundFunctionImpl(FunctionWrapper functionWrapper, const P0& p0, const P1& p1)
: m_functionWrapper(functionWrapper)
Modified: trunk/Tools/ChangeLog (102838 => 102839)
--- trunk/Tools/ChangeLog 2011-12-14 23:50:35 UTC (rev 102838)
+++ trunk/Tools/ChangeLog 2011-12-14 23:55:12 UTC (rev 102839)
@@ -1,3 +1,14 @@
+2011-12-14 Anders Carlsson <[email protected]>
+
+ Work around a bug in the MSVC2005 compiler
+ https://bugs.webkit.org/show_bug.cgi?id=74550
+
+ Reviewed by Sam Weinig.
+
+ Re-enable tests.
+
+ * TestWebKitAPI/Tests/WTF/Functional.cpp:
+
2011-12-14 Csaba Osztrogonác <[email protected]>
[Qt] Test fonts are not used with Qt5
Modified: trunk/Tools/TestWebKitAPI/Tests/WTF/Functional.cpp (102838 => 102839)
--- trunk/Tools/TestWebKitAPI/Tests/WTF/Functional.cpp 2011-12-14 23:50:35 UTC (rev 102838)
+++ trunk/Tools/TestWebKitAPI/Tests/WTF/Functional.cpp 2011-12-14 23:55:12 UTC (rev 102839)
@@ -28,8 +28,6 @@
namespace TestWebKitAPI {
-#if !COMPILER(MSVC)
-
static int returnFortyTwo()
{
return 42;
@@ -107,6 +105,4 @@
ASSERT_EQ(25, function2());
}
-#endif // !COMPILER(MSVC)
-
} // namespace TestWebKitAPI
