From 2859770fd6f68cbf271bc1da610fff22dfbc7c0b Mon Sep 17 00:00:00 2001 From: Jeffrey Mendelsohn Date: Wed, 10 Jul 2024 11:49:43 -0400 Subject: [PATCH] correct nb td warnings (#4821) --- groups/bal/balb/balb_performancemonitor.t.cpp | 3 +-- groups/bal/ball/ball_log.t.cpp | 6 ++++-- groups/bal/ball/ball_ruleset.t.cpp | 2 +- groups/bal/balst/balst_stacktraceutil.t.cpp | 2 +- groups/bal/baltzo/baltzo_localdatetime.t.cpp | 11 ++++++++--- groups/bal/baltzo/baltzo_localtimeperiod.t.cpp | 2 +- groups/bal/baltzo/baltzo_zoneinfo.t.cpp | 4 ++-- 7 files changed, 18 insertions(+), 12 deletions(-) diff --git a/groups/bal/balb/balb_performancemonitor.t.cpp b/groups/bal/balb/balb_performancemonitor.t.cpp index c8a812a019..328051ac22 100644 --- a/groups/bal/balb/balb_performancemonitor.t.cpp +++ b/groups/bal/balb/balb_performancemonitor.t.cpp @@ -800,8 +800,7 @@ int main(int argc, char *argv[]) "))))", "((((", "!@#$%^&*()", "()()()()()()()()", "0123456789abcdef", "((((((((((((((((", "))))))))))))))))", - "very very very very very very very very" - " very very very very long string" }; + "very very very very very very very very very very very very long string" }; enum { k_NUM_STRINGS = sizeof strings / sizeof *strings }; enum { k_LONG_STR_IDX = k_NUM_STRINGS - 1 }; diff --git a/groups/bal/ball/ball_log.t.cpp b/groups/bal/ball/ball_log.t.cpp index 7fa56bb6c9..f5773484eb 100644 --- a/groups/bal/ball/ball_log.t.cpp +++ b/groups/bal/ball/ball_log.t.cpp @@ -1350,7 +1350,8 @@ ResultRec& testSetCategoryHierarchically(const Agg& expectedLevels, // Note that there will be a separate instance of 'holderA' for every // distinct value of 'KK'. - static CatHolder holderA = defaultHolder; + static CatHolder holderA = + { { CatHolder::e_UNINITIALIZED_CATEGORY }, { 0 }, { 0 } }; ASSERTV(pos, repeat || !bsl::memcmp(&holderA, &defaultHolder, sizeof(holderA))); @@ -1410,7 +1411,8 @@ ResultRec& testSetCategoryHierarchically(const Agg& expectedLevels, // a different category holder. Like 'holderA', we will get a separate // copy of 'holderB' for every distinct value of 'KK'. - static CatHolder holderB = defaultHolder; + static CatHolder holderB = + { { CatHolder::e_UNINITIALIZED_CATEGORY }, { 0 }, { 0 } }; ASSERTV(pos, repeat || !bsl::memcmp(&holderB, &defaultHolder, sizeof(holderB))); diff --git a/groups/bal/ball/ball_ruleset.t.cpp b/groups/bal/ball/ball_ruleset.t.cpp index 18090d69aa..e2c59cdd9b 100644 --- a/groups/bal/ball/ball_ruleset.t.cpp +++ b/groups/bal/ball/ball_ruleset.t.cpp @@ -728,7 +728,7 @@ int main(int argc, char *argv[]) "R4R5R6", "R0R1R2R3", - "R0R1R2R3R4" + "R0R1R2R3R4", "R0R1R2R3R4R5", "R0R1R2R3R4R5R6", "R0R1R2R3R4R5R6R7", diff --git a/groups/bal/balst/balst_stacktraceutil.t.cpp b/groups/bal/balst/balst_stacktraceutil.t.cpp index 8def2ec7a9..38f5324ada 100644 --- a/groups/bal/balst/balst_stacktraceutil.t.cpp +++ b/groups/bal/balst/balst_stacktraceutil.t.cpp @@ -446,7 +446,7 @@ void testStackTrace(const balst::StackTrace& st, int tolerateMisses = 0) if (!FORMAT_ELF && !FORMAT_DLADDR && DEBUG_ON && !pastMain) { ASSERT(frame.lineNumber() > 0); } - else if (FORMAT_XCOFF && DEBUG_ON) { + else if (FORMAT_XCOFF && !!DEBUG_ON) { ASSERT(frame.isSourceFileNameKnown()); // There may be one stack frame that had inlined code in it. diff --git a/groups/bal/baltzo/baltzo_localdatetime.t.cpp b/groups/bal/baltzo/baltzo_localdatetime.t.cpp index d3d22d6553..794d6f9085 100644 --- a/groups/bal/baltzo/baltzo_localdatetime.t.cpp +++ b/groups/bal/baltzo/baltzo_localdatetime.t.cpp @@ -685,6 +685,9 @@ int main(int argc, char *argv[]) if ('N' == MEMDST2 && 'Y' == MEMSRC1) { ASSERTV(LINE1, LINE2, 0 < EXCEPTION_COUNT); } +#else + (void)MEMDST2; + (void)MEMSRC1; #endif } BSLMA_TESTALLOCATOR_EXCEPTION_TEST_END @@ -1123,6 +1126,8 @@ int main(int argc, char *argv[]) if ('Y' == MEM) { ASSERTV(LINE, 0 < EXCEPTION_COUNT); } +#else + (void)MEM; #endif } BSLMA_TESTALLOCATOR_EXCEPTION_TEST_END @@ -2901,7 +2906,7 @@ int main(int argc, char *argv[]) objAllocatorPtr = &sa; } break; default: { - ASSERTV(CONFIG, !"Bad allocator config."); + ASSERTV(CONFIG, 0 == "Bad allocator config."); } break; } ASSERTV(LINE, CONFIG, sizeof(Obj) == fa.numBytesInUse()); @@ -3939,7 +3944,7 @@ int main(int argc, char *argv[]) objAllocatorPtr = &sa; } break; default: { - ASSERTV(LINE, CONFIG, !"Bad allocator config."); + ASSERTV(LINE, CONFIG, 0 == "Bad allocator config."); } break; } ASSERTV(LINE, CONFIG, sizeof(Obj) == fa.numBytesInUse()); @@ -4246,7 +4251,7 @@ int main(int argc, char *argv[]) objAllocatorPtr = &sa; } break; default: { - ASSERTV(CONFIG, !"Bad allocator config."); + ASSERTV(CONFIG, 0 == "Bad allocator config."); } break; } diff --git a/groups/bal/baltzo/baltzo_localtimeperiod.t.cpp b/groups/bal/baltzo/baltzo_localtimeperiod.t.cpp index c24061c0dd..20a9535824 100644 --- a/groups/bal/baltzo/baltzo_localtimeperiod.t.cpp +++ b/groups/bal/baltzo/baltzo_localtimeperiod.t.cpp @@ -1185,7 +1185,7 @@ int main(int argc, char *argv[]) done = true; } break; default: { - ASSERTV(CONFIG, !"second switch failed"); + ASSERTV(CONFIG, 0 == "second switch failed"); } } diff --git a/groups/bal/baltzo/baltzo_zoneinfo.t.cpp b/groups/bal/baltzo/baltzo_zoneinfo.t.cpp index 99e1897a72..bdfe394ea9 100644 --- a/groups/bal/baltzo/baltzo_zoneinfo.t.cpp +++ b/groups/bal/baltzo/baltzo_zoneinfo.t.cpp @@ -2536,7 +2536,7 @@ int main(int argc, char *argv[]) // Silence "sometimes-uninitialized" warnings. objPtr = 0; objAllocatorPtr = 0; - LOOP_ASSERT(CONFIG, !"Bad allocator config."); + LOOP_ASSERT(CONFIG, 0 == "Bad allocator config."); } break; } LOOP2_ASSERT(LINE, CONFIG, @@ -4592,7 +4592,7 @@ int main(int argc, char *argv[]) // Silence "sometimes-uninitialized" warnings. objPtr = 0; objAllocatorPtr = 0; - LOOP_ASSERT(CONFIG, !"Bad allocator Config."); + LOOP_ASSERT(CONFIG, 0 == "Bad allocator Config."); } break; }