From 943cb5bf43a77725f161fa9ef761c23ddf70fc13 Mon Sep 17 00:00:00 2001 From: Bill Schwartz Date: Tue, 11 Mar 2014 11:03:11 -0500 Subject: BEAM fixes in errlm, targeting, initservice, mvpd accessors, hwas, and mdia Partial updates for issues 94995 Errlm, 94996 targeting, 94998 istep/initservice 94999 VPD accessors, 95000 HWAS, and 95001 MDIA. Open issues require additional research: push_back memory leak, sync_cond_wait infinite loop, masterCpu uninitialized complaint, checkConstantsMatch template no effect, and shutdown has no effect. Issue will be updated with progress. Change-Id: If60fef67564a0c2cb2a10824100480095e896f17 RTC: 94995 Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/9492 Tested-by: Jenkins Server Reviewed-by: MIKE J. JONES Reviewed-by: STEPHEN M. CPREK Reviewed-by: A. Patrick Williams III --- src/include/assert.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/include') diff --git a/src/include/assert.h b/src/include/assert.h index 84cf1b7b0..2e64cab01 100644 --- a/src/include/assert.h +++ b/src/include/assert.h @@ -5,7 +5,7 @@ /* */ /* IBM CONFIDENTIAL */ /* */ -/* COPYRIGHT International Business Machines Corp. 2011,2013 */ +/* COPYRIGHT International Business Machines Corp. 2011,2014 */ /* */ /* p1 */ /* */ @@ -197,7 +197,7 @@ void __assert(AssertBehavior i_assertb, int i_line); * typedef char CHECKSIZEVAR[(EXPECTED_SIZE == sizeof(DATA)) -1] * */ -#define CPPASSERT(exp) typedef char compile_time_assert_failed[2*((exp)!=0)-1] +#define CPPASSERT(exp) typedef char compile_time_assert_failed[2*((exp)?1:0)-1] #ifdef __cplusplus -- cgit v1.2.1