| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 1 | From 398c6db66c643ed6133cc2b028ab1e27a17c5295 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Mon, 1 May 2017 19:10:09 +0000 |
| 4 | Subject: [PATCH] Fix build failures with gcc7 |
| 5 | |
| 6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 7 | --- |
| 8 | plugins/ipmidirect/ipmi_mc_vendor.cpp | 2 +- |
| 9 | plugins/ipmidirect/ipmi_resource.cpp | 4 ++-- |
| 10 | 2 files changed, 3 insertions(+), 3 deletions(-) |
| 11 | |
| 12 | diff --git a/plugins/ipmidirect/ipmi_mc_vendor.cpp b/plugins/ipmidirect/ipmi_mc_vendor.cpp |
| 13 | index 2c6c090..557771c 100644 |
| 14 | --- a/plugins/ipmidirect/ipmi_mc_vendor.cpp |
| 15 | +++ b/plugins/ipmidirect/ipmi_mc_vendor.cpp |
| 16 | @@ -322,7 +322,7 @@ cIpmiMcVendor::CreateResources( cIpmiDomain *domain, cIpmiMc *source_mc, cIpmiSd |
| 17 | if ( addr.m_channel != source_mc->GetChannel() ) |
| 18 | stdlog << "WARNING : SDR channel " << addr.m_channel << " NOT equal to MC channel " << source_mc->GetChannel() << "\n"; |
| 19 | |
| 20 | - if ( FindOrCreateResource( domain, source_mc, fru_id, sdr, sdrs ) == false ) { |
| 21 | + if ( !FindOrCreateResource( domain, source_mc, fru_id, sdr, sdrs ) ) { |
| 22 | return false; |
| 23 | } |
| 24 | } |
| 25 | diff --git a/plugins/ipmidirect/ipmi_resource.cpp b/plugins/ipmidirect/ipmi_resource.cpp |
| 26 | index c438e74..2552673 100644 |
| 27 | --- a/plugins/ipmidirect/ipmi_resource.cpp |
| 28 | +++ b/plugins/ipmidirect/ipmi_resource.cpp |
| 29 | @@ -73,7 +73,7 @@ cIpmiResource::SendCommandReadLock( const cIpmiMsg &msg, cIpmiMsg &rsp, |
| 30 | |
| 31 | domain->ReadLock(); |
| 32 | |
| 33 | - if ( domain->VerifyResource( resource ) == false ) |
| 34 | + if ( !domain->VerifyResource( resource ) ) |
| 35 | return SA_ERR_HPI_NOT_PRESENT; |
| 36 | |
| 37 | return rv; |
| 38 | @@ -91,7 +91,7 @@ cIpmiResource::SendCommandReadLock( cIpmiRdr *rdr, const cIpmiMsg &msg, cIpmiMsg |
| 39 | |
| 40 | domain->ReadLock(); |
| 41 | |
| 42 | - if ( domain->VerifyRdr( rdr ) == false ) |
| 43 | + if ( !domain->VerifyRdr( rdr ) ) |
| 44 | return SA_ERR_HPI_NOT_PRESENT; |
| 45 | |
| 46 | return rv; |
| 47 | -- |
| 48 | 1.9.1 |
| 49 | |