From 9ac059138681b0ecaacf59dc3dd81b0c97328b39 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Sun, 8 Dec 2013 22:42:43 -0800 Subject: [PATCH 1/3] Bump v0.7.6. --- app/win/atom.rc | 8 ++++---- browser/mac/Info.plist | 2 +- common/atom_version.h | 2 +- package.json | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/win/atom.rc b/app/win/atom.rc index 4126e7c1ad39..c2cbc4449610 100644 --- a/app/win/atom.rc +++ b/app/win/atom.rc @@ -50,8 +50,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,7,5,0 - PRODUCTVERSION 0,7,5,0 + FILEVERSION 0,7,6,0 + PRODUCTVERSION 0,7,6,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -68,12 +68,12 @@ BEGIN BEGIN VALUE "CompanyName", "GitHub, Inc." VALUE "FileDescription", "Atom-Shell" - VALUE "FileVersion", "0.7.5" + VALUE "FileVersion", "0.7.6" VALUE "InternalName", "atom.exe" VALUE "LegalCopyright", "Copyright (C) 2013 GitHub, Inc. All rights reserved." VALUE "OriginalFilename", "atom.exe" VALUE "ProductName", "Atom-Shell" - VALUE "ProductVersion", "0.7.5" + VALUE "ProductVersion", "0.7.6" END END BLOCK "VarFileInfo" diff --git a/browser/mac/Info.plist b/browser/mac/Info.plist index e6be77f2fed2..f5574e549cb6 100644 --- a/browser/mac/Info.plist +++ b/browser/mac/Info.plist @@ -11,7 +11,7 @@ CFBundleIconFile atom.icns CFBundleVersion - 0.7.5 + 0.7.6 NSMainNibFile MainMenu NSPrincipalClass diff --git a/common/atom_version.h b/common/atom_version.h index 34f83448bb08..18f15a19ecff 100644 --- a/common/atom_version.h +++ b/common/atom_version.h @@ -7,7 +7,7 @@ #define ATOM_MAJOR_VERSION 0 #define ATOM_MINOR_VERSION 7 -#define ATOM_PATCH_VERSION 5 +#define ATOM_PATCH_VERSION 6 #define ATOM_VERSION_IS_RELEASE 1 diff --git a/package.json b/package.json index 7984b41a7979..32a3a9c297b0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "atom-shell", - "version": "0.7.5", + "version": "0.7.6", "devDependencies": { "coffee-script": "~1.6.3", From 597e17b540560f73d79601a820432a1b1236f036 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Mon, 9 Dec 2013 16:34:10 +0800 Subject: [PATCH 2/3] Fix template related compilation errors of VC++. --- common/swap_or_assign.h | 34 ++++++++++++++++++++++++++++++++-- common/v8_conversions.h | 2 +- 2 files changed, 33 insertions(+), 3 deletions(-) diff --git a/common/swap_or_assign.h b/common/swap_or_assign.h index 3953653f8f57..a3749ca88202 100644 --- a/common/swap_or_assign.h +++ b/common/swap_or_assign.h @@ -5,8 +5,37 @@ #ifndef ATOM_COMMON_SWAP_OR_ASSIGN_H_ #define ATOM_COMMON_SWAP_OR_ASSIGN_H_ +#include "base/compiler_specific.h" + namespace internal { +#if defined(OS_WIN) +template inline +void SwapOrAssign(T& v1, const T& v2) { + __if_exists(T::swap) { + v1.swap(const_cast(v2)); + } + + __if_not_exists(T::swap) { + v1 = v2; + } +} + +template inline +void SwapOrAssign(T*& v1, T* v2) { + v1 = v2; +} + +inline +void SwapOrAssign(int& v1, int v2) { + v1 = v2; +} + +inline +void SwapOrAssign(bool& v1, bool v2) { + v1 = v2; +} +#else // defined(OS_WIN) // Helper to detect whether value has specified method. template class HasSwapMethod { @@ -24,17 +53,18 @@ struct enable_if {}; template struct enable_if { typedef T type; }; -template +template inline typename enable_if::value>::type SwapOrAssign( T& v1, const T& v2) { v1.swap(const_cast(v2)); } -template +template inline typename enable_if::value>::type SwapOrAssign( T& v1, const T& v2) { v1 = v2; } +#endif // !defined(OS_WIN) } // namespace internal diff --git a/common/v8_conversions.h b/common/v8_conversions.h index 90ae2fc79d2b..0c1f147e1417 100644 --- a/common/v8_conversions.h +++ b/common/v8_conversions.h @@ -237,7 +237,7 @@ bool FromV8Arguments(const v8::Arguments& args, T1* value, int index = 0) { if (!V8ValueCanBeConvertedTo(args[index])) return false; internal::SwapOrAssign(*value, - static_cast(FromV8Value(args[index]))); + FromV8Value(args[index]).operator T1()); return true; } From c116f6b35cf5362edce857b913341e2d3a0552bc Mon Sep 17 00:00:00 2001 From: Kyle Robinson Young Date: Thu, 12 Dec 2013 22:31:19 -0800 Subject: [PATCH 3/3] Fix a couple minor typos in docs --- docs/api/browser/menu.md | 2 +- docs/development/build-instructions-windows.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/api/browser/menu.md b/docs/api/browser/menu.md index 2e813d5b6e1d..b14241181d10 100644 --- a/docs/api/browser/menu.md +++ b/docs/api/browser/menu.md @@ -12,7 +12,7 @@ var Menu = require('menu'); var MenuItem = require('menu-item'); var menu = new Menu(); -menu.append(new MenuItem({ label: 'MenuItem1', click: function() { console.log('item 1clicked'); } })); +menu.append(new MenuItem({ label: 'MenuItem1', click: function() { console.log('item 1 clicked'); } })); menu.append(new MenuItem({ type: 'separator' })); menu.append(new MenuItem({ label: 'MenuItem2', type: 'checkbox', clicked: true })); diff --git a/docs/development/build-instructions-windows.md b/docs/development/build-instructions-windows.md index cfa2e656b8b1..f2170225c341 100644 --- a/docs/development/build-instructions-windows.md +++ b/docs/development/build-instructions-windows.md @@ -3,9 +3,9 @@ ## Prerequisites * Windows 7 or later -* Visual Studio 2010 Express or Profissional +* Visual Studio 2010 Express or Professional * Make sure "X64 Compilers and Tools" are installed if you use the - Profissional edition. + Professional edition. * [Python 2.7](http://www.python.org/download/releases/2.7/) * [node.js](http://nodejs.org/) * [git](http://git-scm.com)