Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(905)

Side by Side Diff: src/d8.cc

Issue 367293002: Buildfix for windows after r22180 (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « samples/shell.cc ('k') | src/mksnapshot.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 the V8 project authors. All rights reserved. 1 // Copyright 2012 the V8 project authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 5
6 // Defined when linking against shared lib on Windows. 6 // Defined when linking against shared lib on Windows.
7 #if defined(USING_V8_SHARED) && !defined(V8_SHARED) 7 #if defined(USING_V8_SHARED) && !defined(V8_SHARED)
8 #define V8_SHARED 8 #define V8_SHARED
9 #endif 9 #endif
10 10
(...skipping 1532 matching lines...) Expand 10 before | Expand all | Expand 10 after
1543 // Disallow copy & assign. 1543 // Disallow copy & assign.
1544 StartupDataHandler(const StartupDataHandler& other); 1544 StartupDataHandler(const StartupDataHandler& other);
1545 void operator=(const StartupDataHandler& other); 1545 void operator=(const StartupDataHandler& other);
1546 }; 1546 };
1547 #endif // V8_USE_EXTERNAL_STARTUP_DATA 1547 #endif // V8_USE_EXTERNAL_STARTUP_DATA
1548 1548
1549 1549
1550 int Shell::Main(int argc, char* argv[]) { 1550 int Shell::Main(int argc, char* argv[]) {
1551 if (!SetOptions(argc, argv)) return 1; 1551 if (!SetOptions(argc, argv)) return 1;
1552 v8::V8::InitializeICU(options.icu_data_file); 1552 v8::V8::InitializeICU(options.icu_data_file);
1553 v8::Platform* platform = 1553 v8::Platform* platform = v8::platform::CreateDefaultPlatform();
1554 v8::platform::CreateDefaultPlatform(base::OS::NumberOfProcessorsOnline());
1555 v8::V8::InitializePlatform(platform); 1554 v8::V8::InitializePlatform(platform);
1556 #ifdef V8_USE_EXTERNAL_STARTUP_DATA 1555 #ifdef V8_USE_EXTERNAL_STARTUP_DATA
1557 StartupDataHandler startup_data(options.natives_blob, options.snapshot_blob); 1556 StartupDataHandler startup_data(options.natives_blob, options.snapshot_blob);
1558 #endif 1557 #endif
1559 SetFlagsFromString("--trace-hydrogen-file=hydrogen.cfg"); 1558 SetFlagsFromString("--trace-hydrogen-file=hydrogen.cfg");
1560 SetFlagsFromString("--redirect-code-traces-to=code.asm"); 1559 SetFlagsFromString("--redirect-code-traces-to=code.asm");
1561 ShellArrayBufferAllocator array_buffer_allocator; 1560 ShellArrayBufferAllocator array_buffer_allocator;
1562 MockArrayBufferAllocator mock_arraybuffer_allocator; 1561 MockArrayBufferAllocator mock_arraybuffer_allocator;
1563 if (options.mock_arraybuffer_allocator) { 1562 if (options.mock_arraybuffer_allocator) {
1564 v8::V8::SetArrayBufferAllocator(&mock_arraybuffer_allocator); 1563 v8::V8::SetArrayBufferAllocator(&mock_arraybuffer_allocator);
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
1639 } 1638 }
1640 1639
1641 } // namespace v8 1640 } // namespace v8
1642 1641
1643 1642
1644 #ifndef GOOGLE3 1643 #ifndef GOOGLE3
1645 int main(int argc, char* argv[]) { 1644 int main(int argc, char* argv[]) {
1646 return v8::Shell::Main(argc, argv); 1645 return v8::Shell::Main(argc, argv);
1647 } 1646 }
1648 #endif 1647 #endif
OLDNEW
« no previous file with comments | « samples/shell.cc ('k') | src/mksnapshot.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698