diff options
| author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-23 20:12:31 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-23 20:12:31 +0000 |
| commit | d11ff2a8cad5cd9d285ae4cb5d0e7df9127d4f7b (patch) | |
| tree | bee8f82eb589769efe9676799371f99a8175bb71 /win8/metro_driver | |
| parent | e7a1173b669eaafcbae1bdbdf469603385d5633d (diff) | |
| download | chromium_src-d11ff2a8cad5cd9d285ae4cb5d0e7df9127d4f7b.zip chromium_src-d11ff2a8cad5cd9d285ae4cb5d0e7df9127d4f7b.tar.gz chromium_src-d11ff2a8cad5cd9d285ae4cb5d0e7df9127d4f7b.tar.bz2 | |
Don't require sdk patch when compiling with vs2012
The 2012 compiler can handle the "enum class" so don't force patching if compiling with 2012. Cast a limited selection
logging of enum class types to avoid needing to add overloads to base/logging for those types (they don't decay to int).
R=robertshield@chromium.org
TEST=ninja -C out\Debug metro_driver with 2010/2012 and see if check_sdk_patch is generated/not.
Review URL: https://chromiumcodereview.appspot.com/12676005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190073 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'win8/metro_driver')
| -rw-r--r-- | win8/metro_driver/file_picker.cc | 6 | ||||
| -rw-r--r-- | win8/metro_driver/secondary_tile.cc | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/win8/metro_driver/file_picker.cc b/win8/metro_driver/file_picker.cc index acb66e9..5016ecb 100644 --- a/win8/metro_driver/file_picker.cc +++ b/win8/metro_driver/file_picker.cc @@ -228,7 +228,7 @@ HRESULT OpenFilePickerSession::SinglePickerDone(SingleFileAsyncOp* async, LOG(ERROR) << "NULL IStorageItem"; } } else { - LOG(ERROR) << "Unexpected async status " << status; + LOG(ERROR) << "Unexpected async status " << static_cast<int>(status); } event_.Signal(); @@ -260,7 +260,7 @@ HRESULT OpenFilePickerSession::MultiPickerDone(MultiFileAsyncOp* async, LOG(ERROR) << "NULL StorageFileVectorCollection"; } } else { - LOG(ERROR) << "Unexpected async status " << status; + LOG(ERROR) << "Unexpected async status " << static_cast<int>(status); } event_.Signal(); @@ -597,7 +597,7 @@ HRESULT SaveFilePickerSession::FilePickerDone(SaveFileAsyncOp* async, LOG(ERROR) << "NULL IStorageItem"; } } else { - LOG(ERROR) << "Unexpected async status " << status; + LOG(ERROR) << "Unexpected async status " << static_cast<int>(status); } event_.Signal(); diff --git a/win8/metro_driver/secondary_tile.cc b/win8/metro_driver/secondary_tile.cc index dd99a8a..0cbe358 100644 --- a/win8/metro_driver/secondary_tile.cc +++ b/win8/metro_driver/secondary_tile.cc @@ -77,7 +77,8 @@ HRESULT TileRequestCompleter::Respond(winfoundtn::IAsyncOperation<bool>* async, break; } } else { - LOG(ERROR) << __FUNCTION__ << " Unexpected async status " << status; + LOG(ERROR) << __FUNCTION__ << " Unexpected async status " + << static_cast<int>(status); pin_state = type_ == PIN ? base::win::METRO_PIN_RESULT_ERROR : base::win::METRO_UNPIN_RESULT_ERROR; |