diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-07-16 14:53:18 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-07-16 14:53:18 +0000 |
| commit | f3d27028ce9a280c02c286f9b98adf1e476c03d2 (patch) | |
| tree | dca7e434477e7454b81894977f75e455af4cc0dc /system_wrappers | |
| parent | 477e6bce6816b8bb433c2e6c44b377bdc766a3b3 (diff) | |
| parent | 82383d9b14ff8e5fedf5a70229eb0ac6b512909a (diff) | |
| download | webrtc-f3d27028ce9a280c02c286f9b98adf1e476c03d2.tar.gz | |
Merge third_party/webrtc from https://chromium.googlesource.com/external/webrtc/trunk/webrtc.git at 82383d9b14ff8e5fedf5a70229eb0ac6b512909a
This commit was generated by merge_from_chromium.py.
Change-Id: I8c578be801fa38420e875a4a8cef17e7522252e2
Diffstat (limited to 'system_wrappers')
| -rw-r--r-- | system_wrappers/source/thread_win.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system_wrappers/source/thread_win.cc b/system_wrappers/source/thread_win.cc index c68ee1ad..bcb95e7b 100644 --- a/system_wrappers/source/thread_win.cc +++ b/system_wrappers/source/thread_win.cc @@ -159,7 +159,7 @@ void ThreadWindows::Run() { if (set_thread_name_) { WEBRTC_TRACE(kTraceStateInfo, kTraceUtility, id_, "Thread with name:%s started ", name_); - SetThreadName(-1, name_); // -1, set thread name for the calling thread. + SetThreadName(static_cast<DWORD>(-1), name_); // -1 == caller thread. } else { WEBRTC_TRACE(kTraceStateInfo, kTraceUtility, id_, "Thread without name started"); |