Title: [92715] trunk/Source/ThirdParty
- Revision
- 92715
- Author
- [email protected]
- Date
- 2011-08-09 15:09:07 -0700 (Tue, 09 Aug 2011)
Log Message
Fix gtest to compile in the release configuration with clang.
This change was made upstream in r443.
* gtest/src/gtest.cc:
Modified Paths
Diff
Modified: trunk/Source/ThirdParty/ChangeLog (92714 => 92715)
--- trunk/Source/ThirdParty/ChangeLog 2011-08-09 21:53:59 UTC (rev 92714)
+++ trunk/Source/ThirdParty/ChangeLog 2011-08-09 22:09:07 UTC (rev 92715)
@@ -1,3 +1,11 @@
+2011-08-09 Mark Rowe <[email protected]>
+
+ Fix gtest to compile in the release configuration with clang.
+
+ This change was made upstream in r443.
+
+ * gtest/src/gtest.cc:
+
2011-08-04 Mark Rowe <[email protected]>
Future-proof Xcode configuration settings.
Modified: trunk/Source/ThirdParty/gtest/src/gtest.cc (92714 => 92715)
--- trunk/Source/ThirdParty/gtest/src/gtest.cc 2011-08-09 21:53:59 UTC (rev 92714)
+++ trunk/Source/ThirdParty/gtest/src/gtest.cc 2011-08-09 22:09:07 UTC (rev 92715)
@@ -3602,7 +3602,7 @@
// the --gtest_catch_exceptions flags are specified.
DebugBreak();
#else
- *static_cast<int*>(NULL) = 1;
+ *static_cast<volatile int*>(NULL) = 1;
#endif // GTEST_OS_WINDOWS
} else if (GTEST_FLAG(throw_on_failure)) {
#if GTEST_HAS_EXCEPTIONS
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
