Attachment 168585 Details for Bug 208270 – Fix several std::map declarations in www/node

[patch] Fix several std::map declarations in www/node

www__node-fix-map-declarations-1.diff (text/plain), 4.17 KB, created by Dimitry Andric on 2016-03-24 22:50:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dimitry Andric

Created: 2016-03-24 22:50:59 UTC

Size: 4.17 KB

patch

obsolete

>Index: www/node/files/patch-deps_v8_src_compiler_instruction.h
>===================================================================
>--- www/node/files/patch-deps_v8_src_compiler_instruction.h	(nonexistent)
>+++ www/node/files/patch-deps_v8_src_compiler_instruction.h	(working copy)
>@@ -0,0 +1,11 @@
>+--- deps/v8/src/compiler/instruction.h.orig	2016-03-16 21:22:58.000000000 +0100
>++++ deps/v8/src/compiler/instruction.h	2016-03-24 23:27:23.004854000 +0100
>+@@ -1011,7 +1011,7 @@ class InstructionBlock final : public Zo
>+ 
>+ typedef ZoneDeque<Constant> ConstantDeque;
>+ typedef std::map<int, Constant, std::less<int>,
>+-                 zone_allocator<std::pair<int, Constant> > > ConstantMap;
>++                 zone_allocator<std::pair<const int, Constant> > > ConstantMap;
>+ 
>+ typedef ZoneDeque<Instruction*> InstructionDeque;
>+ typedef ZoneDeque<ReferenceMap*> ReferenceMapDeque;
>
>Property changes on: www/node/files/patch-deps_v8_src_compiler_instruction.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: www/node/files/patch-deps_v8_src_compiler_js-type-feedback.h
>===================================================================
>--- www/node/files/patch-deps_v8_src_compiler_js-type-feedback.h	(nonexistent)
>+++ www/node/files/patch-deps_v8_src_compiler_js-type-feedback.h	(working copy)
>@@ -0,0 +1,15 @@
>+--- deps/v8/src/compiler/js-type-feedback.h.orig	2016-03-16 21:22:58.000000000 +0100
>++++ deps/v8/src/compiler/js-type-feedback.h	2016-03-24 22:54:54.529827000 +0100
>+@@ -33,9 +33,10 @@ class JSTypeFeedbackTable : public ZoneO
>+  private:
>+   friend class JSTypeFeedbackSpecializer;
>+   typedef std::map<NodeId, TypeFeedbackId, std::less<NodeId>,
>+-                   zone_allocator<TypeFeedbackId> > TypeFeedbackIdMap;
>++                   zone_allocator<std::pair<const NodeId, TypeFeedbackId> > >
>++      TypeFeedbackIdMap;
>+   typedef std::map<NodeId, FeedbackVectorICSlot, std::less<NodeId>,
>+-                   zone_allocator<FeedbackVectorICSlot> >
>++                   zone_allocator<std::pair<const NodeId, FeedbackVectorICSlot> > >
>+       FeedbackVectorICSlotMap;
>+ 
>+   TypeFeedbackIdMap type_feedback_id_map_;
>
>Property changes on: www/node/files/patch-deps_v8_src_compiler_js-type-feedback.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: www/node/files/patch-deps_v8_src_zone-containers.h
>===================================================================
>--- www/node/files/patch-deps_v8_src_zone-containers.h	(nonexistent)
>+++ www/node/files/patch-deps_v8_src_zone-containers.h	(working copy)
>@@ -0,0 +1,18 @@
>+--- deps/v8/src/zone-containers.h.orig	2016-03-16 21:22:58.000000000 +0100
>++++ deps/v8/src/zone-containers.h	2016-03-24 23:34:37.741885000 +0100
>+@@ -114,12 +114,12 @@ class ZoneSet : public std::set<K, Compa
>+ // a zone allocator.
>+ template <typename K, typename V, typename Compare = std::less<K>>
>+ class ZoneMap
>+-    : public std::map<K, V, Compare, zone_allocator<std::pair<K, V>>> {
>++    : public std::map<K, V, Compare, zone_allocator<std::pair<const K, V>>> {
>+  public:
>+   // Constructs an empty map.
>+   explicit ZoneMap(Zone* zone)
>+-      : std::map<K, V, Compare, zone_allocator<std::pair<K, V>>>(
>+-            Compare(), zone_allocator<std::pair<K, V>>(zone)) {}
>++      : std::map<K, V, Compare, zone_allocator<std::pair<const K, V>>>(
>++            Compare(), zone_allocator<std::pair<const K, V>>(zone)) {}
>+ };
>+ 
>+ 
>
>Property changes on: www/node/files/patch-deps_v8_src_zone-containers.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 208270: 168585