xx < ::

component/onlyoffice-core/buildout.cfg

@@ -14,7 +14,7 @@ url = https://github.com/ONLYOFFICE/core/archive/f84ee9a5a30b79a2995a96f8019978d
 md5sum = 2ead88646094941dc8de12cdc72ba3b2
 patch-options = -p0
 patches =
-  ${:_profile_base_location_}/rewrite-scripts.patch#32b838ad295e483d1474dda61a7566f4
+  ${:_profile_base_location_}/rewrite-scripts.patch#1c001e448c68237426e18d4c2b0e674e
   ${:_profile_base_location_}/cryptopp.patch#a2f892e23e13952539d1acfd013be7de
 #  ${:_profile_base_location_}/avoid-7z.patch#0dd7356c1a766ec14e0e8bcafcffe1a7
 # error: 'to_wstring' is not a member of 'std' -> http://www.cplusplus.com/forum/general/109469/

component/onlyoffice-core/rewrite-scripts.patch

@@ -338,7 +338,7 @@
 +git apply ../slapos-v8.patch
 --- /dev/null	2017-01-30 09:00:09.914078893 +0100
 +++ Common/3dParty/v8/slapos-v8.patch	2017-02-01 16:39:12.093279611 +0100
-@@ -0,0 +1,162 @@
+@@ -0,0 +1,184 @@
 +diff --git a/build/standalone.gypi b/build/standalone.gypi
 +index f804715..48eea0f 100644
 +--- a/build/standalone.gypi
@@ -449,7 +449,7 @@
 + 
 + namespace v8 {
 +diff --git a/test/cctest/test-macro-assembler-mips64.cc b/test/cctest/test-macro-assembler-mips64.cc
-+index e74703b..9495bfc 100644
++index e74703b..5648984 100644
 +--- a/test/cctest/test-macro-assembler-mips64.cc
 ++++ b/test/cctest/test-macro-assembler-mips64.cc
 +@@ -36,6 +36,10 @@
@@ -463,6 +463,15 @@
 + 
 + using namespace v8::internal;
 + 
++@@ -456,7 +460,7 @@ static uint64_t run_dlsa(uint64_t rt, uint64_t rs, int8_t sa) {
++   Handle<Code> code = isolate->factory()->NewCode(
++       desc, Code::ComputeFlags(Code::STUB), Handle<Code>());
++ 
++-  ::F f = FUNCTION_CAST<::F>(code->entry());
+++  ::F f = FUNCTION_CAST< ::F>(code->entry());
++ 
++   uint64_t res = reinterpret_cast<uint64_t>(
++       CALL_GENERATED_CODE(isolate, f, rt, rs, 0, 0, 0));
 +diff --git a/test/cctest/test-unboxed-doubles.cc b/test/cctest/test-unboxed-doubles.cc
 +index f195a31..45499ce 100644
 +--- a/test/cctest/test-unboxed-doubles.cc
@@ -501,3 +510,16 @@
 + using namespace v8::base;
 + using namespace v8::internal;
 + using namespace v8::internal::compiler;
++diff --git a/test/unittests/compiler/register-allocator-unittest.cc b/test/unittests/compiler/register-allocator-unittest.cc
++index c5ff90f..decf1ff 100644
++--- a/test/unittests/compiler/register-allocator-unittest.cc
+++++ b/test/unittests/compiler/register-allocator-unittest.cc
++@@ -722,7 +722,7 @@ class SlotConstraintTest : public RegisterAllocatorTest,
++   int variant() const { return ::testing::get<1>(B::GetParam()); }
++ 
++  private:
++-  typedef ::testing::WithParamInterface<::testing::tuple<ParameterType, int>> B;
+++  typedef ::testing::WithParamInterface< ::testing::tuple<ParameterType, int>> B;
++ };
++ 
++ }  // namespace