Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (187701 => 187702)
--- trunk/Source/_javascript_Core/ChangeLog 2015-08-01 01:36:13 UTC (rev 187701)
+++ trunk/Source/_javascript_Core/ChangeLog 2015-08-01 01:56:57 UTC (rev 187702)
@@ -1,3 +1,13 @@
+2015-07-31 Alex Christensen <[email protected]>
+
+ Prepare for VS2015
+ https://bugs.webkit.org/show_bug.cgi?id=146579
+
+ Reviewed by Jon Honeycutt.
+
+ * heap/Heap.h:
+ Fix compiler error by explicitly casting zombifiedBits to the size of a pointer.
+
2015-07-31 Saam barati <[email protected]>
ES6 class syntax should use block scoping
Modified: trunk/Source/_javascript_Core/heap/Heap.h (187701 => 187702)
--- trunk/Source/_javascript_Core/heap/Heap.h 2015-08-01 01:36:13 UTC (rev 187701)
+++ trunk/Source/_javascript_Core/heap/Heap.h 2015-08-01 01:56:57 UTC (rev 187702)
@@ -73,7 +73,7 @@
class Worklist;
}
-static void* const zombifiedBits = reinterpret_cast<void*>(0xdeadbeef);
+static void* const zombifiedBits = reinterpret_cast<void*>(static_cast<uintptr_t>(0xdeadbeef));
typedef HashCountedSet<JSCell*> ProtectCountSet;
typedef HashCountedSet<const char*> TypeCountSet;
Modified: trunk/Source/WTF/ChangeLog (187701 => 187702)
--- trunk/Source/WTF/ChangeLog 2015-08-01 01:36:13 UTC (rev 187701)
+++ trunk/Source/WTF/ChangeLog 2015-08-01 01:56:57 UTC (rev 187702)
@@ -1,3 +1,14 @@
+2015-07-31 Alex Christensen <[email protected]>
+
+ Prepare for VS2015
+ https://bugs.webkit.org/show_bug.cgi?id=146579
+
+ Reviewed by Jon Honeycutt.
+
+ * wtf/StdLibExtras.h:
+ (std::exchange):
+ Added preprocessor macros around functions implemented in VS2015's standard library.
+
2015-07-30 Chris Dumez <[email protected]>
Mark more classes as fast allocated
Modified: trunk/Source/WTF/wtf/StdLibExtras.h (187701 => 187702)
--- trunk/Source/WTF/wtf/StdLibExtras.h 2015-08-01 01:36:13 UTC (rev 187701)
+++ trunk/Source/WTF/wtf/StdLibExtras.h 2015-08-01 01:56:57 UTC (rev 187702)
@@ -338,6 +338,8 @@
make_unique(Args&&...) = delete;
#endif
+// MSVC 2015 supports these functions.
+#if !COMPILER(MSVC) || _MSC_VER < 1900
// Compile-time integer sequences
// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2013/n3658.html
// (Note that we only implement index_sequence, and not the more generic integer_sequence).
@@ -366,6 +368,7 @@
return oldValue;
}
+#endif
#if COMPILER_SUPPORTS(CXX_USER_LITERALS)
// These literals are available in C++14, so once we require C++14 compilers we can get rid of them here.
Modified: trunk/Source/WebCore/ChangeLog (187701 => 187702)
--- trunk/Source/WebCore/ChangeLog 2015-08-01 01:36:13 UTC (rev 187701)
+++ trunk/Source/WebCore/ChangeLog 2015-08-01 01:56:57 UTC (rev 187702)
@@ -1,3 +1,13 @@
+2015-07-31 Alex Christensen <[email protected]>
+
+ Prepare for VS2015
+ https://bugs.webkit.org/show_bug.cgi?id=146579
+
+ Reviewed by Jon Honeycutt.
+
+ * WebCore.vcxproj/build-generated-files.pl:
+ Find a correct preprocessor when using VS2015.
+
2015-07-31 Eric Carlson <[email protected]>
[iOS] use a media-specific user gesture check
Modified: trunk/Source/WebCore/WebCore.vcxproj/build-generated-files.pl (187701 => 187702)
--- trunk/Source/WebCore/WebCore.vcxproj/build-generated-files.pl 2015-08-01 01:36:13 UTC (rev 187701)
+++ trunk/Source/WebCore/WebCore.vcxproj/build-generated-files.pl 2015-08-01 01:56:57 UTC (rev 187702)
@@ -83,6 +83,11 @@
if ($Config{osname} eq 'MSWin32') {
my $ccPath = `where $ARGV[4]`;
+
+ # Visual Studio 2015 gives us a list of cl executables separated by newlines, and we want the last one.
+ my @ccPaths = split("\n", $ccPath);
+ $ccPath = @ccPaths[scalar(@ccPaths) - 1];
+
chomp($ccPath);
$ENV{CC} = $ccPath;
}
Modified: trunk/Tools/ChangeLog (187701 => 187702)
--- trunk/Tools/ChangeLog 2015-08-01 01:36:13 UTC (rev 187701)
+++ trunk/Tools/ChangeLog 2015-08-01 01:56:57 UTC (rev 187702)
@@ -1,3 +1,13 @@
+2015-07-31 Alex Christensen <[email protected]>
+
+ Prepare for VS2015
+ https://bugs.webkit.org/show_bug.cgi?id=146579
+
+ Reviewed by Jon Honeycutt.
+
+ * WinLauncher/stdafx.h:
+ Define __STDC_LIMIT_MACROS to have access to INTMAX_MAX.
+
2015-07-31 Csaba Osztrogonác <[email protected]>
[EFL] Fix pixman build on ARM with GCC 4.9.3
Modified: trunk/Tools/WinLauncher/stdafx.h (187701 => 187702)
--- trunk/Tools/WinLauncher/stdafx.h 2015-08-01 01:36:13 UTC (rev 187701)
+++ trunk/Tools/WinLauncher/stdafx.h 2015-08-01 01:56:57 UTC (rev 187702)
@@ -50,6 +50,11 @@
#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
+// Needed for limit defines, like INTMAX_MAX, which is used by the std C++ library
+#ifndef __STDC_LIMIT_MACROS
+#define __STDC_LIMIT_MACROS
+#endif
+
#ifndef NOMINMAX
#define NOMINMAX
#endif
