Title: [230620] trunk/Source/WebCore
Revision
230620
Author
commit-qu...@webkit.org
Date
2018-04-12 18:56:24 -0700 (Thu, 12 Apr 2018)

Log Message

[Curl] Fix clang build error in CurlContext.cpp
https://bugs.webkit.org/show_bug.cgi?id=184561

Patch by Christopher Reid <chris.r...@sony.com> on 2018-04-12
Reviewed by Darin Adler.

MSVC allows explicit template specialization in classes but gcc/clang do not.

* platform/network/curl/CurlContext.cpp:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (230619 => 230620)


--- trunk/Source/WebCore/ChangeLog	2018-04-13 01:27:54 UTC (rev 230619)
+++ trunk/Source/WebCore/ChangeLog	2018-04-13 01:56:24 UTC (rev 230620)
@@ -1,5 +1,16 @@
 2018-04-12  Christopher Reid  <chris.r...@sony.com>
 
+        [Curl] Fix clang build error in CurlContext.cpp
+        https://bugs.webkit.org/show_bug.cgi?id=184561
+
+        Reviewed by Darin Adler.
+
+        MSVC allows explicit template specialization in classes but gcc/clang do not.
+
+        * platform/network/curl/CurlContext.cpp:
+
+2018-04-12  Christopher Reid  <chris.r...@sony.com>
+
         [Curl] Cookie Database on memory path should be :memory:
         https://bugs.webkit.org/show_bug.cgi?id=184572
 

Modified: trunk/Source/WebCore/platform/network/curl/CurlContext.cpp (230619 => 230620)


--- trunk/Source/WebCore/platform/network/curl/CurlContext.cpp	2018-04-13 01:27:54 UTC (rev 230619)
+++ trunk/Source/WebCore/platform/network/curl/CurlContext.cpp	2018-04-13 01:56:24 UTC (rev 230620)
@@ -66,12 +66,14 @@
         ASSERT_NOT_REACHED();
         return nullptr;
     }
-
-    // define specialized member function for specific type.
-    template<> constexpr const char* sscanTemplate<signed>() { return "%d"; }
-    template<> constexpr const char* sscanTemplate<unsigned>() { return "%u"; }
 };
 
+template<>
+constexpr const char* EnvironmentVariableReader::sscanTemplate<signed>() { return "%d"; }
+
+template<>
+constexpr const char* EnvironmentVariableReader::sscanTemplate<unsigned>() { return "%u"; }
+
 // CurlContext -------------------------------------------------------------------
 
 CurlContext& CurlContext::singleton()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to