[llvm-branch-commits] [lldb] r257706 - Merging r257692:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Wed Jan 13 17:13:49 2016
New Revision: 257706

URL: http://llvm.org/viewvc/llvm-project?rev=257706&view=rev
Log:
Merging r257692:
------------------------------------------------------------------------
r257692 | hans | 2016-01-13 14:40:26 -0800 (Wed, 13 Jan 2016) | 7 lines

Fix -Wformat-pedantic warning

/work/llvm-3.8/llvm.src/tools/lldb/source/API/SBProcess.cpp:1003:73:
error: format specifies type 'void *' but the argument has type 'lldb_private::Event *' [-Werror,-Wformat-pedantic]
        log->Printf ("SBProcess::%s (event.sp=%p) => %d", __FUNCTION__, event.get(), ret_val);
                                              ~~                        ^~~~~~~~~~~
1 error generated.
------------------------------------------------------------------------

Modified:
    lldb/branches/release_38/   (props changed)
    lldb/branches/release_38/source/API/SBProcess.cpp

Propchange: lldb/branches/release_38/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 13 17:13:49 2016
@@ -1,3 +1,3 @@
 /lldb/branches/apple/python-GIL:156467-162159
 /lldb/branches/iohandler:198360-200250
-/lldb/trunk:257691
+/lldb/trunk:257691-257692

Modified: lldb/branches/release_38/source/API/SBProcess.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/release_38/source/API/SBProcess.cpp?rev=257706&r1=257705&r2=257706&view=diff
==============================================================================
--- lldb/branches/release_38/source/API/SBProcess.cpp (original)
+++ lldb/branches/release_38/source/API/SBProcess.cpp Wed Jan 13 17:13:49 2016
@@ -1000,7 +1000,8 @@ SBProcess::GetRestartedFromEvent (const
     bool ret_val = Process::ProcessEventData::GetRestartedFromEvent (event.get());
 
     if (log)
-        log->Printf ("SBProcess::%s (event.sp=%p) => %d", __FUNCTION__, event.get(), ret_val);
+        log->Printf ("SBProcess::%s (event.sp=%p) => %d", __FUNCTION__,
+                     static_cast<void*>(event.get()), ret_val);
 
     return ret_val;
 }