mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

win: Fix building, close #2018

Browse source
This commit is contained in:
Cheng Zhao 2015-06-23 10:18:43 +08:00
parent 19963bfcd1
commit 1ce86b6dfc
5 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
atom/browser/api/atom_api_cookies.cc
View file

@ -343,7 +343,7 @@ mate::ObjectTemplateBuilder Cookies::GetObjectTemplateBuilder(
mate::Handle<Cookies> Cookies::Create( mate::Handle<Cookies> Cookies::Create(
v8::Isolate* isolate, v8::Isolate* isolate,
content::BrowserContext* browser_context) { content::BrowserContext* browser_context) {
return CreateHandle(isolate, new Cookies(browser_context)); return mate::CreateHandle(isolate, new Cookies(browser_context));
} }
} // namespace api } // namespace api

2
atom/browser/api/atom_api_protocol.cc
View file

@ -354,7 +354,7 @@ void Protocol::EmitEventInUI(const std::string& event,
// static // static
mate::Handle<Protocol> Protocol::Create( mate::Handle<Protocol> Protocol::Create(
v8::Isolate* isolate, AtomBrowserContext* browser_context) { v8::Isolate* isolate, AtomBrowserContext* browser_context) {
return CreateHandle(isolate, new Protocol(browser_context)); return mate::CreateHandle(isolate, new Protocol(browser_context));
} }
} // namespace api } // namespace api

2
atom/browser/api/atom_api_session.cc
View file

@ -41,7 +41,7 @@ mate::ObjectTemplateBuilder Session::GetObjectTemplateBuilder(
mate::Handle<Session> Session::Create( mate::Handle<Session> Session::Create(
v8::Isolate* isolate, v8::Isolate* isolate,
content::BrowserContext* browser_context) { content::BrowserContext* browser_context) {
return CreateHandle(isolate, new Session(browser_context)); return mate::CreateHandle(isolate, new Session(browser_context));
} }
} // namespace api } // namespace api

4
common.gypi
View file

@ -38,15 +38,16 @@
'target_conditions': [ 'target_conditions': [
['_target_name in ["libuv", "http_parser", "openssl", "cares", "node", "zlib"]', { ['_target_name in ["libuv", "http_parser", "openssl", "cares", "node", "zlib"]', {
'msvs_disabled_warnings': [ 'msvs_disabled_warnings': [
4703, # potentially uninitialized local pointer variable 'req' used
4013, # 'free' undefined; assuming extern returning int 4013, # 'free' undefined; assuming extern returning int
4018, # signed/unsigned mismatch 4018, # signed/unsigned mismatch
4054, # 4054, #
4055, # 'type cast' : from data pointer 'void *' to function pointer
4057, # 'function' : 'volatile LONG *' differs in indirection to slightly different base types from 'unsigned long *' 4057, # 'function' : 'volatile LONG *' differs in indirection to slightly different base types from 'unsigned long *'
4189, # 4189, #
4131, # uses old-style declarator 4131, # uses old-style declarator
4133, # incompatible types 4133, # incompatible types
4146, # unary minus operator applied to unsigned type, result still unsigned 4146, # unary minus operator applied to unsigned type, result still unsigned
4164, # intrinsic function not declared
4152, # function/data pointer conversion in expression 4152, # function/data pointer conversion in expression
4206, # translation unit is empty 4206, # translation unit is empty
4204, # non-constant aggregate initializer 4204, # non-constant aggregate initializer
@ -58,6 +59,7 @@
4389, # '==' : signed/unsigned mismatch 4389, # '==' : signed/unsigned mismatch
4505, # unreferenced local function has been removed 4505, # unreferenced local function has been removed
4701, # potentially uninitialized local variable 'sizew' used 4701, # potentially uninitialized local variable 'sizew' used
4703, # potentially uninitialized local pointer variable 'req' used
4706, # assignment within conditional expression 4706, # assignment within conditional expression
4804, # unsafe use of type 'bool' in operation 4804, # unsafe use of type 'bool' in operation
4996, # this function or variable may be unsafe. 4996, # this function or variable may be unsafe.

4
script/upload.py
View file

@ -85,10 +85,6 @@ def main():
os.path.join(DIST_DIR, MKSNAPSHOT_NAME)) os.path.join(DIST_DIR, MKSNAPSHOT_NAME))
if PLATFORM == 'win32': if PLATFORM == 'win32':
# Upload PDBs to Windows symbol server.
execute([sys.executable,
os.path.join(SOURCE_ROOT, 'script', 'upload-windows-pdb.py')])
# Upload node headers. # Upload node headers.
execute([sys.executable, execute([sys.executable,
os.path.join(SOURCE_ROOT, 'script', 'upload-node-headers.py'), os.path.join(SOURCE_ROOT, 'script', 'upload-node-headers.py'),