Changeset 102839 in webkit

Timestamp:

Dec 14, 2011 3:55:12 PM (12 years ago)

Author:

andersca@apple.com

Message:

Work around a bug in the MSVC2005 compiler
​https://bugs.webkit.org/show_bug.cgi?id=74550

Reviewed by Sam Weinig.

Source/JavaScriptCore:

Add template parameters for the return types of the partial specializations of BoundFunctionImpl.

• wtf/Functional.h:

(WTF::R):

Tools:

Re-enable tests.

• TestWebKitAPI/Tests/WTF/Functional.cpp:

Location:

trunk

Files:

• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/wtf/Functional.h (modified) (5 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WTF/Functional.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-12-14  Anders Carlsson  <andersca@apple.com>
+
+        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  <jonlee@apple.com>
 

trunk/Source/JavaScriptCore/wtf/Functional.h

@@ -150 +150 @@
 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)
@@ -157 +157 @@
     }
 
-    virtual typename FunctionWrapper::ResultType operator()()
+    virtual R operator()()
     {
         return m_functionWrapper();
@@ -166 +166 @@
 };
 
-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:
@@ -175 +175 @@
     }
 
-    virtual typename FunctionWrapper::ResultType operator()()
+    virtual R operator()()
     {
         return m_functionWrapper(m_p0);
@@ -185 +185 @@
 };
 
-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)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-12-14  Anders Carlsson  <andersca@apple.com>
+
+        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  <ossy@webkit.org>
 

trunk/Tools/TestWebKitAPI/Tests/WTF/Functional.cpp

@@ -28 +28 @@
 
 namespace TestWebKitAPI {
-
-#if !COMPILER(MSVC)
 
 static int returnFortyTwo()
@@ -108 +106 @@
 }
 
-#endif // !COMPILER(MSVC)
-
 } // namespace TestWebKitAPI