<!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>[198085] trunk/Tools</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/198085">198085</a></dd>
<dt>Author</dt> <dd>ddkilzer@apple.com</dd>
<dt>Date</dt> <dd>2016-03-13 15:28:11 -0700 (Sun, 13 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>TestWebKitAPI: fix linker warnings
<http://webkit.org/b/155394>
Reviewed by Darin Adler.
* TestWebKitAPI/CMakeLists.txt:
- Add RefLogger.cpp source file.
- Add other missing cross-platform source files.
- Add FIXMEs about RunLoop.cpp and about missing
platform-specific source files.
* TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
- Add RefLogger.cpp source file.
* TestWebKitAPI/Counters.cpp:
(DeleterCounter<ConstructorDestructorCounter>::deleterCount):
Move specific declaration here to fix linker warning.
* TestWebKitAPI/Counters.h:
(DeleterCounter<T>::deleterCount): Remove declaration of global
template variable.
* TestWebKitAPI/Tests/WTF/RefLogger.cpp: Added.
(TestWebKitAPI::log): Added. Move inline definition in
RefLogger.h to here to fix linker warning.
* TestWebKitAPI/Tests/WTF/RefLogger.h:
(TestWebKitAPI::log): Replace inline function with declaration.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPICMakeListstxt">trunk/Tools/TestWebKitAPI/CMakeLists.txt</a></li>
<li><a href="#trunkToolsTestWebKitAPICounterscpp">trunk/Tools/TestWebKitAPI/Counters.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPICountersh">trunk/Tools/TestWebKitAPI/Counters.h</a></li>
<li><a href="#trunkToolsTestWebKitAPITestWebKitAPIxcodeprojprojectpbxproj">trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWTFRefLoggerh">trunk/Tools/TestWebKitAPI/Tests/WTF/RefLogger.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkToolsTestWebKitAPITestsWTFRefLoggercpp">trunk/Tools/TestWebKitAPI/Tests/WTF/RefLogger.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (198084 => 198085)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-03-13 22:03:44 UTC (rev 198084)
+++ trunk/Tools/ChangeLog 2016-03-13 22:28:11 UTC (rev 198085)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2016-03-13 David Kilzer <ddkilzer@apple.com>
+
+ TestWebKitAPI: fix linker warnings
+ <http://webkit.org/b/155394>
+
+ Reviewed by Darin Adler.
+
+ * TestWebKitAPI/CMakeLists.txt:
+ - Add RefLogger.cpp source file.
+ - Add other missing cross-platform source files.
+ - Add FIXMEs about RunLoop.cpp and about missing
+ platform-specific source files.
+ * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
+ - Add RefLogger.cpp source file.
+
+ * TestWebKitAPI/Counters.cpp:
+ (DeleterCounter<ConstructorDestructorCounter>::deleterCount):
+ Move specific declaration here to fix linker warning.
+ * TestWebKitAPI/Counters.h:
+ (DeleterCounter<T>::deleterCount): Remove declaration of global
+ template variable.
+
+ * TestWebKitAPI/Tests/WTF/RefLogger.cpp: Added.
+ (TestWebKitAPI::log): Added. Move inline definition in
+ RefLogger.h to here to fix linker warning.
+
+ * TestWebKitAPI/Tests/WTF/RefLogger.h:
+ (TestWebKitAPI::log): Replace inline function with declaration.
+
</ins><span class="cx"> 2016-03-12 David Kilzer <ddkilzer@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r178615): Fix incorrect case in included header for WeakPtr.cpp
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPICMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/CMakeLists.txt (198084 => 198085)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/CMakeLists.txt 2016-03-13 22:03:44 UTC (rev 198084)
+++ trunk/Tools/TestWebKitAPI/CMakeLists.txt 2016-03-13 22:28:11 UTC (rev 198085)
</span><span class="lines">@@ -41,9 +41,10 @@
</span><span class="cx"> ${TESTWEBKITAPI_DIR}/Counters.cpp
</span><span class="cx"> ${TESTWEBKITAPI_DIR}/TestsController.cpp
</span><span class="cx"> ${TESTWEBKITAPI_DIR}/Tests/WTF/AtomicString.cpp
</span><ins>+ ${TESTWEBKITAPI_DIR}/Tests/WTF/BloomFilter.cpp
</ins><span class="cx"> ${TESTWEBKITAPI_DIR}/Tests/WTF/CString.cpp
</span><ins>+ ${TESTWEBKITAPI_DIR}/Tests/WTF/CheckedArithmeticOperations.cpp
</ins><span class="cx"> ${TESTWEBKITAPI_DIR}/Tests/WTF/Condition.cpp
</span><del>- ${TESTWEBKITAPI_DIR}/Tests/WTF/CheckedArithmeticOperations.cpp
</del><span class="cx"> ${TESTWEBKITAPI_DIR}/Tests/WTF/DateMath.cpp
</span><span class="cx"> ${TESTWEBKITAPI_DIR}/Tests/WTF/Deque.cpp
</span><span class="cx"> ${TESTWEBKITAPI_DIR}/Tests/WTF/Functional.cpp
</span><span class="lines">@@ -62,6 +63,8 @@
</span><span class="cx"> ${TESTWEBKITAPI_DIR}/Tests/WTF/ParkingLot.cpp
</span><span class="cx"> ${TESTWEBKITAPI_DIR}/Tests/WTF/RedBlackTree.cpp
</span><span class="cx"> ${TESTWEBKITAPI_DIR}/Tests/WTF/Ref.cpp
</span><ins>+ ${TESTWEBKITAPI_DIR}/Tests/WTF/RefCounter.cpp
+ ${TESTWEBKITAPI_DIR}/Tests/WTF/RefLogger.cpp
</ins><span class="cx"> ${TESTWEBKITAPI_DIR}/Tests/WTF/RefPtr.cpp
</span><span class="cx"> ${TESTWEBKITAPI_DIR}/Tests/WTF/SHA1.cpp
</span><span class="cx"> ${TESTWEBKITAPI_DIR}/Tests/WTF/SaturatedArithmeticOperations.cpp
</span><span class="lines">@@ -73,9 +76,13 @@
</span><span class="cx"> ${TESTWEBKITAPI_DIR}/Tests/WTF/TemporaryChange.cpp
</span><span class="cx"> ${TESTWEBKITAPI_DIR}/Tests/WTF/Vector.cpp
</span><span class="cx"> ${TESTWEBKITAPI_DIR}/Tests/WTF/WTFString.cpp
</span><ins>+ ${TESTWEBKITAPI_DIR}/Tests/WTF/WeakPtr.cpp
</ins><span class="cx"> ${TESTWEBKITAPI_DIR}/Tests/WTF/WorkQueue.cpp
</span><span class="cx"> )
</span><span class="cx">
</span><ins>+# FIXME: Tests/WTF/RunLoop.cpp is missing because it doesn't work for Windows.
+# FIXME: Platform-specific sources in Tests/WTF are not included in TestWTF_SOURCES.
+
</ins><span class="cx"> WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
</span><span class="cx">
</span><span class="cx"> include_directories(
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPICounterscpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Counters.cpp (198084 => 198085)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Counters.cpp 2016-03-13 22:03:44 UTC (rev 198084)
+++ trunk/Tools/TestWebKitAPI/Counters.cpp 2016-03-13 22:28:11 UTC (rev 198085)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2014, 2016 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -32,3 +32,5 @@
</span><span class="cx">
</span><span class="cx"> unsigned ConstructorDestructorCounter::constructionCount = 0;
</span><span class="cx"> unsigned ConstructorDestructorCounter::destructionCount = 0;
</span><ins>+
+template<> unsigned DeleterCounter<ConstructorDestructorCounter>::deleterCount = 0;
</ins></span></pre></div>
<a id="trunkToolsTestWebKitAPICountersh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Counters.h (198084 => 198085)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Counters.h 2016-03-13 22:03:44 UTC (rev 198084)
+++ trunk/Tools/TestWebKitAPI/Counters.h 2016-03-13 22:28:11 UTC (rev 198085)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2014 Igalia S.L.
</span><del>- * Copyright (C) 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2014, 2016 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -83,6 +83,4 @@
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><del>-template<class T> unsigned DeleterCounter<T>::deleterCount = 0;
-
</del><span class="cx"> #endif // Counters_h
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestWebKitAPIxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj (198084 => 198085)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj 2016-03-13 22:03:44 UTC (rev 198084)
+++ trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj 2016-03-13 22:28:11 UTC (rev 198085)
</span><span class="lines">@@ -63,6 +63,7 @@
</span><span class="cx"> 37E1064C1697681800B78BD0 /* DOMHTMLTableCellElementCellAbove.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 37E1064B169767F700B78BD0 /* DOMHTMLTableCellElementCellAbove.html */; };
</span><span class="cx"> 41973B5B1AF2286A006C7B36 /* FileSystem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41973B5A1AF2286A006C7B36 /* FileSystem.cpp */; };
</span><span class="cx"> 41973B5D1AF22875006C7B36 /* SharedBuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41973B5C1AF22875006C7B36 /* SharedBuffer.cpp */; };
</span><ins>+ 442BBF6A1C91CB1B0017087F /* RefLogger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 442BBF681C91CAD90017087F /* RefLogger.cpp */; };
</ins><span class="cx"> 4BFDFFA71314776C0061F24B /* HitTestResultNodeHandle_Bundle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BFDFFA61314776C0061F24B /* HitTestResultNodeHandle_Bundle.cpp */; };
</span><span class="cx"> 51393E221523952D005F39C5 /* DOMWindowExtensionBasic_Bundle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51393E1D1523944A005F39C5 /* DOMWindowExtensionBasic_Bundle.cpp */; };
</span><span class="cx"> 5142B2731517C8C800C32B19 /* ContextMenuCanCopyURL.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 5142B2721517C89100C32B19 /* ContextMenuCanCopyURL.html */; };
</span><span class="lines">@@ -602,6 +603,7 @@
</span><span class="cx"> 41973B5A1AF2286A006C7B36 /* FileSystem.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileSystem.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 41973B5C1AF22875006C7B36 /* SharedBuffer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SharedBuffer.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 440A1D3814A0103A008A66F2 /* URL.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = URL.cpp; sourceTree = "<group>"; };
</span><ins>+ 442BBF681C91CAD90017087F /* RefLogger.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RefLogger.cpp; sourceTree = "<group>"; };
</ins><span class="cx"> 44A622C114A0E2B60048515B /* WTFStringUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WTFStringUtilities.h; sourceTree = "<group>"; };
</span><span class="cx"> 4A410F4B19AF7BD6002EBAB5 /* UserMedia.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UserMedia.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 4A410F4D19AF7BEF002EBAB5 /* getUserMedia.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = getUserMedia.html; sourceTree = "<group>"; };
</span><span class="lines">@@ -1314,6 +1316,7 @@
</span><span class="cx"> 0FC6C4CB141027E0005B7F0C /* RedBlackTree.cpp */,
</span><span class="cx"> 93A427AA180DA26400CD24D7 /* Ref.cpp */,
</span><span class="cx"> 86BD19971A2DB05B006DCF0A /* RefCounter.cpp */,
</span><ins>+ 442BBF681C91CAD90017087F /* RefLogger.cpp */,
</ins><span class="cx"> 93A427AD180DA60F00CD24D7 /* RefLogger.h */,
</span><span class="cx"> 93A427A8180D9B0700CD24D7 /* RefPtr.cpp */,
</span><span class="cx"> E4C9ABC71B3DB1710040A987 /* RunLoop.cpp */,
</span><span class="lines">@@ -1779,6 +1782,7 @@
</span><span class="cx"> 7CCE7F361A411B8E00447C4C /* HashSet.cpp in Sources */,
</span><span class="cx"> 7CCE7EFA1A411AE600447C4C /* HitTestResultNodeHandle.cpp in Sources */,
</span><span class="cx"> 7CCE7EC11A411A7E00447C4C /* HTMLCollectionNamedItem.mm in Sources */,
</span><ins>+ 442BBF6A1C91CB1B0017087F /* RefLogger.cpp in Sources */,
</ins><span class="cx"> 7CCE7EC21A411A7E00447C4C /* HTMLFormCollectionNamedItem.mm in Sources */,
</span><span class="cx"> 7CCE7EFB1A411AE600447C4C /* InjectedBundleBasic.cpp in Sources */,
</span><span class="cx"> 7CCE7EFC1A411AE600447C4C /* InjectedBundleFrameHitTest.cpp in Sources */,
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWTFRefLoggercppfromrev198084trunkToolsTestWebKitAPICounterscpp"></a>
<div class="copfile"><h4>Copied: trunk/Tools/TestWebKitAPI/Tests/WTF/RefLogger.cpp (from rev 198084, trunk/Tools/TestWebKitAPI/Counters.cpp) (0 => 198085)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WTF/RefLogger.cpp (rev 0)
+++ trunk/Tools/TestWebKitAPI/Tests/WTF/RefLogger.cpp 2016-03-13 22:28:11 UTC (rev 198085)
</span><span class="lines">@@ -0,0 +1,38 @@
</span><ins>+/*
+ * Copyright (C) 2013, 2016 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+
+#include "RefLogger.h"
+
+namespace TestWebKitAPI {
+
+std::ostringstream& log()
+{
+ static std::ostringstream log;
+ return log;
+}
+
+}
</ins></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWTFRefLoggerh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WTF/RefLogger.h (198084 => 198085)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WTF/RefLogger.h 2016-03-13 22:03:44 UTC (rev 198084)
+++ trunk/Tools/TestWebKitAPI/Tests/WTF/RefLogger.h 2016-03-13 22:28:11 UTC (rev 198085)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013, 2016 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -27,11 +27,7 @@
</span><span class="cx">
</span><span class="cx"> namespace TestWebKitAPI {
</span><span class="cx">
</span><del>-inline std::ostringstream& log()
-{
- static std::ostringstream log;
- return log;
-}
</del><ins>+std::ostringstream& log();
</ins><span class="cx">
</span><span class="cx"> inline std::string takeLogStr()
</span><span class="cx"> {
</span></span></pre>
</div>
</div>
</body>
</html>