fix compilation for 7-1-x

electron · Jan 15, 2020 · 644c1bd · 644c1bd
1 parent 047158b
commit 644c1bd
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/native_mate/native_mate/converter.h b/native_mate/native_mate/converter.h
@@ -241,6 +241,18 @@ struct Converter<std::vector<T>> {
   }
 };
 
+template <typename T1, typename T2>
+struct Converter<std::pair<T1, T2>> {
+  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
+                                   const std::pair<T1, T2>& val) {
+    v8::Local<v8::Array> result(v8::Array::New(isolate, 2));
+    auto context = isolate->GetCurrentContext();
+    result->Set(context, 0, Converter<T1>::ToV8(isolate, val.first)).Check();
+    result->Set(context, 1, Converter<T2>::ToV8(isolate, val.second)).Check();
+    return result;
+  }
+};
+
 template <typename T>
 struct Converter<std::set<T>> {
   static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,

diff --git a/shell/browser/api/atom_api_url_loader.cc b/shell/browser/api/atom_api_url_loader.cc
@@ -33,21 +33,21 @@
 #include "shell/common/node_includes.h"
 #include "shell/common/promise_util.h"
 
-namespace gin {
+namespace mate {
 
 template <>
 struct Converter<network::mojom::HttpRawHeaderPairPtr> {
   static v8::Local<v8::Value> ToV8(
       v8::Isolate* isolate,
       const network::mojom::HttpRawHeaderPairPtr& pair) {
-    gin_helper::Dictionary dict = gin::Dictionary::CreateEmpty(isolate);
+    mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate);
     dict.Set("key", base::ToLowerASCII(pair->key));
     dict.Set("value", pair->value);
     return dict.GetHandle();
   }
 };
 
-}  // namespace gin
+}  // namespace mate
 
 namespace electron {