diff options
| author | gab <gab@chromium.org> | 2015-08-27 18:13:24 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-08-28 01:13:52 +0000 |
| commit | 2a85add76b2927db8249e0287dc2301b6eafd023 (patch) | |
| tree | d526f93b5ad5c78064d690087389c8241658f999 /cloud_print | |
| parent | 74894bf702dc1809d694a2d9270f44a904b7f171 (diff) | |
| download | chromium_src-2a85add76b2927db8249e0287dc2301b6eafd023.zip chromium_src-2a85add76b2927db8249e0287dc2301b6eafd023.tar.gz chromium_src-2a85add76b2927db8249e0287dc2301b6eafd023.tar.bz2 | |
Redefine CreateFileVersionInfoForCurrentModule() as a macro on Windows.
This makes extra sure that inlining occurs.
When __force_inline doesn't work... brute-force-inline..!
BUG=516359
TBR=gene@chromium.org
Review URL: https://codereview.chromium.org/1306603003
Cr-Commit-Position: refs/heads/master@{#346041}
Diffstat (limited to 'cloud_print')
| -rw-r--r-- | cloud_print/common/win/install_utils.cc | 4 | ||||
| -rw-r--r-- | cloud_print/virtual_driver/win/install/setup.cc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cloud_print/common/win/install_utils.cc b/cloud_print/common/win/install_utils.cc index eed09b3..b18d5fd 100644 --- a/cloud_print/common/win/install_utils.cc +++ b/cloud_print/common/win/install_utils.cc @@ -61,7 +61,7 @@ void SetGoogleUpdateKeys(const base::string16& product_id, // Get the version from the resource file. base::string16 version_string; scoped_ptr<FileVersionInfo> version_info( - FileVersionInfo::CreateFileVersionInfoForCurrentModule()); + CREATE_FILE_VERSION_INFO_FOR_CURRENT_MODULE()); if (version_info.get()) { FileVersionInfoWin* version_info_win = @@ -152,7 +152,7 @@ void CreateUninstallKey(const base::string16& uninstall_id, // Get the version resource. scoped_ptr<FileVersionInfo> version_info( - FileVersionInfo::CreateFileVersionInfoForCurrentModule()); + CREATE_FILE_VERSION_INFO_FOR_CURRENT_MODULE()); if (version_info.get()) { FileVersionInfoWin* version_info_win = diff --git a/cloud_print/virtual_driver/win/install/setup.cc b/cloud_print/virtual_driver/win/install/setup.cc index fe764a10..9032258 100644 --- a/cloud_print/virtual_driver/win/install/setup.cc +++ b/cloud_print/virtual_driver/win/install/setup.cc @@ -172,7 +172,7 @@ HRESULT RegisterPortMonitor(bool install, const base::FilePath& install_path) { DWORDLONG GetVersionNumber() { DWORDLONG retval = 0; scoped_ptr<FileVersionInfo> version_info( - FileVersionInfo::CreateFileVersionInfoForCurrentModule()); + CREATE_FILE_VERSION_INFO_FOR_CURRENT_MODULE()); if (version_info.get()) { FileVersionInfoWin* version_info_win = static_cast<FileVersionInfoWin*>(version_info.get()); |