[llvm-branch-commits] [llvm-branch] r308488 - Merging r308484:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Wed Jul 19 08:45:56 2017
New Revision: 308488

URL: http://llvm.org/viewvc/llvm-project?rev=308488&view=rev
Log:
Merging r308484:
------------------------------------------------------------------------
r308484 | hans | 2017-07-19 08:06:31 -0700 (Wed, 19 Jul 2017) | 1 line

Defeat another -Wunused-but-set-variable warning
------------------------------------------------------------------------

Modified:
    llvm/branches/release_50/   (props changed)
    llvm/branches/release_50/examples/ParallelJIT/ParallelJIT.cpp

Propchange: llvm/branches/release_50/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 19 08:45:56 2017
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,308483
+/llvm/trunk:155241,308483-308484

Modified: llvm/branches/release_50/examples/ParallelJIT/ParallelJIT.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_50/examples/ParallelJIT/ParallelJIT.cpp?rev=308488&r1=308487&r2=308488&view=diff
==============================================================================
--- llvm/branches/release_50/examples/ParallelJIT/ParallelJIT.cpp (original)
+++ llvm/branches/release_50/examples/ParallelJIT/ParallelJIT.cpp Wed Jul 19 08:45:56 2017
@@ -145,6 +145,7 @@ public:
     waitFor = 0;
 
     int result = pthread_cond_init( &condition, nullptr );
+    (void)result;
     assert( result == 0 );
 
     result = pthread_mutex_init( &mutex, nullptr );