diff options
| author | dcheng <dcheng@chromium.org> | 2016-03-11 20:56:00 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-12 04:57:29 +0000 |
| commit | bd780bff9a4002c0241234e458cacf735236a288 (patch) | |
| tree | eb35c0674a2a0fff0d4012f06173ea118d60494c /device | |
| parent | 81525a6aa0dd64018fa3089f6c9424833f042bc5 (diff) | |
| download | chromium_src-bd780bff9a4002c0241234e458cacf735236a288.zip chromium_src-bd780bff9a4002c0241234e458cacf735236a288.tar.gz chromium_src-bd780bff9a4002c0241234e458cacf735236a288.tar.bz2 | |
Change scoped_ptr to a type alias for std::unique_ptr for OS_MACOSX
BUG=554298, 579269
R=danakj@chromium.org
TBR=avi@chromium.org,scheib@chromium.org,sdefresne@chromium.org
Review URL: https://codereview.chromium.org/1789723006
Cr-Commit-Position: refs/heads/master@{#380861}
Diffstat (limited to 'device')
| -rw-r--r-- | device/bluetooth/bluetooth_socket_mac.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/device/bluetooth/bluetooth_socket_mac.h b/device/bluetooth/bluetooth_socket_mac.h index 63edc66..7f94dd7 100644 --- a/device/bluetooth/bluetooth_socket_mac.h +++ b/device/bluetooth/bluetooth_socket_mac.h @@ -154,7 +154,7 @@ class BluetoothSocketMac : public BluetoothSocket { void ReleaseChannel(); void ReleaseListener(); - bool is_connecting() const { return connect_callbacks_; } + bool is_connecting() const { return !!connect_callbacks_; } // Used to verify that all methods are called on the same thread. base::ThreadChecker thread_checker_; |