Changeset 83557 in webkit

Timestamp:

Apr 11, 2011 10:40:06 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-04-11 Ben Taylor <​bentaylor.solx86@gmail.com>

Reviewed by Alexey Proskuryakov.

​https://bugs.webkit.org/show_bug.cgi?id=58289

Fix compilation on Solaris/Studio 12 C++ in wtf/FastMalloc.cpp,
WTF::TCMalloc_PageHeap::runScavengerThread(void*) expected to return a value.

• wtf/FastMalloc.cpp: (WTF::TCMalloc_PageHeap::runScavengerThread):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• wtf/FastMalloc.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-04-11  Ben Taylor  <bentaylor.solx86@gmail.com>
+
+        Reviewed by Alexey Proskuryakov.
+
+        https://bugs.webkit.org/show_bug.cgi?id=58289
+
+        Fix compilation on Solaris/Studio 12 C++ in wtf/FastMalloc.cpp,
+        WTF::TCMalloc_PageHeap::runScavengerThread(void*) expected to return a value.
+
+        * wtf/FastMalloc.cpp:
+        (WTF::TCMalloc_PageHeap::runScavengerThread):
+
 2011-04-11  Mark Rowe  <mrowe@apple.com>
 

trunk/Source/JavaScriptCore/wtf/FastMalloc.cpp

@@ -1619 +1619 @@
 void* TCMalloc_PageHeap::runScavengerThread(void* context)
 {
-  static_cast<TCMalloc_PageHeap*>(context)->scavengerThread();
-#if COMPILER(MSVC)
-  // Without this, Visual Studio will complain that this method does not return a value.
-  return 0;
+    static_cast<TCMalloc_PageHeap*>(context)->scavengerThread();
+#if (COMPILER(MSVC) || COMPILER(SUNCC))
+    // Without this, Visual Studio and Sun Studio will complain that this method does not return a value.
+    return 0;
 #endif
 }