From 45c229d2c00448a503b325ff3f440e88cfe6f449 Mon Sep 17 00:00:00 2001 From: Jeffrey Mendelsohn Date: Fri, 14 Jun 2024 14:12:12 -0400 Subject: [PATCH] reduce warnings (#4794) --- groups/bdl/bdlat/bdlat_typecategory.h | 2 +- groups/bdl/bdldfp/bdldfp_decimalplatform.t.cpp | 8 ++++---- groups/bdl/bdljsn/bdljsn_jsonnumber.h | 4 ++-- groups/bdl/bdlm/bdlm_metricsregistry.t.cpp | 2 +- groups/bdl/bdlmt/bdlmt_threadmultiplexor.t.cpp | 12 ++++++------ groups/bsl/bslma/bslma_sharedptroutofplacerep.t.cpp | 9 +++++---- groups/bsl/bslmt/bslmt_readerwriterlockassert.t.cpp | 4 ++-- standalones/s_baltst/s_baltst_enumerated.cpp | 2 +- standalones/s_baltst/s_baltst_myenumeration.cpp | 2 +- ...s_baltst_myenumerationunpreservedwithfallback.cpp | 2 +- .../s_baltst/s_baltst_myenumerationwithfallback.cpp | 2 +- 11 files changed, 25 insertions(+), 24 deletions(-) diff --git a/groups/bdl/bdlat/bdlat_typecategory.h b/groups/bdl/bdlat/bdlat_typecategory.h index 54c42eab32..c76c81e49b 100644 --- a/groups/bdl/bdlat/bdlat_typecategory.h +++ b/groups/bdl/bdlat/bdlat_typecategory.h @@ -794,7 +794,7 @@ BSLS_IDENT("$Id: $") // return bdlat_TypeCategory::e_SIMPLE_CATEGORY; // RETURN // } // -// assert(!"Reached"); +// assert(0 == "Reached"); // // // Note that this 'return' is never reached and hence the returned // // value is immaterial. diff --git a/groups/bdl/bdldfp/bdldfp_decimalplatform.t.cpp b/groups/bdl/bdldfp/bdldfp_decimalplatform.t.cpp index 1904d3a83b..68139053cc 100644 --- a/groups/bdl/bdldfp/bdldfp_decimalplatform.t.cpp +++ b/groups/bdl/bdldfp/bdldfp_decimalplatform.t.cpp @@ -185,8 +185,8 @@ int main(int argc, char* argv[]) << bsl::endl; #ifndef BDLDFP_DECIMALPLATFORM_SNPRINTF_BUFFER_SIZE - ASSERT(!"BDLDFP_DECIMALPLATFORM_SNPRINTF_BUFFER_SIZE" - " is not defined!"); + ASSERT(0 == "BDLDFP_DECIMALPLATFORM_SNPRINTF_BUFFER_SIZE" + " is not defined!"); #endif // NaN macros must exist, and be valid NaN objects, by not comparing @@ -605,8 +605,8 @@ int main(int argc, char* argv[]) << "SANE CONFIGURATION" << bsl::endl << "==================" << bsl::endl; #ifndef BDLDFP_DECIMALPLATFORM_SNPRINTF_BUFFER_SIZE - ASSERT(!"BDLDFP_DECIMALPLATFORM_SNPRINTF_BUFFER_SIZE" - " is not defined!"); + ASSERT(0 == "BDLDFP_DECIMALPLATFORM_SNPRINTF_BUFFER_SIZE" + " is not defined!"); #endif #ifdef BDLDFP_DECIMALPLATFORM_C99_TR diff --git a/groups/bdl/bdljsn/bdljsn_jsonnumber.h b/groups/bdl/bdljsn/bdljsn_jsonnumber.h index a5ba257467..30d5f80e13 100644 --- a/groups/bdl/bdljsn/bdljsn_jsonnumber.h +++ b/groups/bdl/bdljsn/bdljsn_jsonnumber.h @@ -268,7 +268,7 @@ BSLS_IDENT("$Id: $") // bsl::cout << obj.value() << ": NG too small" << bsl::endl; // } break; // case bdljsn::JsonNumber::k_NOT_INTEGRAL: { -// assert(!"reached"); +// assert(0 == "reached"); // } break; // } //.. @@ -289,7 +289,7 @@ BSLS_IDENT("$Id: $") // bsl::cout << value << ": inexact: USE approximation"; // } break; // case bdljsn::JsonNumber::k_NOT_INTEGRAL: { -// assert(!"reached"); +// assert(0 == "reached"); // } break; // } // diff --git a/groups/bdl/bdlm/bdlm_metricsregistry.t.cpp b/groups/bdl/bdlm/bdlm_metricsregistry.t.cpp index e1ba2b1405..79a808a1de 100644 --- a/groups/bdl/bdlm/bdlm_metricsregistry.t.cpp +++ b/groups/bdl/bdlm/bdlm_metricsregistry.t.cpp @@ -895,7 +895,7 @@ int main(int argc, char *argv[]) objPtr = new (fa) Obj(objAllocatorPtr); } break; default: { - BSLS_ASSERT_OPT(!"Bad allocator config."); + BSLS_ASSERT_OPT(0 == "Bad allocator config."); } break; } diff --git a/groups/bdl/bdlmt/bdlmt_threadmultiplexor.t.cpp b/groups/bdl/bdlmt/bdlmt_threadmultiplexor.t.cpp index ed4a42a4a9..9d055ead96 100644 --- a/groups/bdl/bdlmt/bdlmt_threadmultiplexor.t.cpp +++ b/groups/bdl/bdlmt/bdlmt_threadmultiplexor.t.cpp @@ -535,8 +535,8 @@ int main(int argc, char *argv[]) (OQUEUE_MAX_PROC, MAX_QUEUESIZE, &tp, &ta); if (0 != tp.start()) { - ASSERT(!"Could not start thread pool! " - "Threads cannot be created!"); + ASSERT(0 == "Could not start thread pool! " + "Threads cannot be created!"); break; } if (veryVerbose) cout << "Thread-pool Started" << endl; @@ -640,8 +640,8 @@ int main(int argc, char *argv[]) bdlmt::FixedThreadPool tp(NUM_THREADS, MAX_QUEUESIZE, &ta); if (0 != tp.start()) { - ASSERT(!"Could not start thread pool! " - "Threads cannot be created!"); + ASSERT(0 == "Could not start thread pool! " + "Threads cannot be created!"); break; } if (veryVerbose) cout << "Thread-pool Started" << endl; @@ -709,8 +709,8 @@ int main(int argc, char *argv[]) TestQueue otherQueue(maxProc, MAX_QUEUESIZE, &tp, &ta); if (0 != tp.start()) { - ASSERT(!"Could not start thread pool! " - "Threads cannot be created!"); + ASSERT(0 == "Could not start thread pool! " + "Threads cannot be created!"); break; } if (veryVerbose) cout << "Thread-pool Started" << endl; diff --git a/groups/bsl/bslma/bslma_sharedptroutofplacerep.t.cpp b/groups/bsl/bslma/bslma_sharedptroutofplacerep.t.cpp index 0e763755b2..ee3b7f6346 100644 --- a/groups/bsl/bslma/bslma_sharedptroutofplacerep.t.cpp +++ b/groups/bsl/bslma/bslma_sharedptroutofplacerep.t.cpp @@ -441,8 +441,8 @@ MyAllocArgTestDeleter::MyAllocArgTestDeleter( , d_deleter_p(original.d_deleter_p) , d_memory_p(d_allocator_p->allocate(13)) { - ASSERT(!"'MyAllocArgTestDeleter::MyAllocArgTestDeleter(original)' should" - " not be used."); + ASSERT(0 == "'MyAllocArgTestDeleter::MyAllocArgTestDeleter(original)'" + " should not be used."); } MyAllocArgTestDeleter::MyAllocArgTestDeleter( @@ -549,8 +549,9 @@ MyBslAllocArgTestDeleter::MyBslAllocArgTestDeleter( , d_deleter_p(original.d_deleter_p) , d_memory_p(d_allocator.allocate(13)) { - ASSERT(!"'MyBslAllocArgTestDeleter::MyBslAllocArgTestDeleter(original)'" - " should not be used."); + ASSERT(0 == + "'MyBslAllocArgTestDeleter::MyBslAllocArgTestDeleter(original)'" + " should not be used."); } MyBslAllocArgTestDeleter::MyBslAllocArgTestDeleter( diff --git a/groups/bsl/bslmt/bslmt_readerwriterlockassert.t.cpp b/groups/bsl/bslmt/bslmt_readerwriterlockassert.t.cpp index 9577851f7c..a40c17268b 100644 --- a/groups/bsl/bslmt/bslmt_readerwriterlockassert.t.cpp +++ b/groups/bsl/bslmt/bslmt_readerwriterlockassert.t.cpp @@ -584,7 +584,7 @@ void test() BSLMT_READERWRITERLOCKASSERT_IS_LOCKED_READ( &rwLock); BSLMT_READERWRITERLOCKASSERT_IS_LOCKED_WRITE(&rwLock); } catch (bsls::AssertTestException thrown) { - ASSERT(!"Reachable") + ASSERT(0 == "Reachable") } #endif // BSLS_ASSERT_IS_ACTIVE @@ -628,7 +628,7 @@ void test() BSLMT_READERWRITERLOCKASSERT_IS_LOCKED_READ_OPT( &rwLock); BSLMT_READERWRITERLOCKASSERT_IS_LOCKED_WRITE_OPT(&rwLock); } catch (bsls::AssertTestException thrown) { - ASSERT(!"Reachable") + ASSERT(0 == "Reachable") } #endif // BSLS_ASSERT_OPT_IS_ACTIVE diff --git a/standalones/s_baltst/s_baltst_enumerated.cpp b/standalones/s_baltst/s_baltst_enumerated.cpp index a2d6e642da..7613d2f4f5 100644 --- a/standalones/s_baltst/s_baltst_enumerated.cpp +++ b/standalones/s_baltst/s_baltst_enumerated.cpp @@ -101,7 +101,7 @@ const char *Enumerated::toString(Enumerated::Value value) } } - BSLS_ASSERT(!"invalid enumerator"); + BSLS_ASSERT(0 == "invalid enumerator"); return 0; } diff --git a/standalones/s_baltst/s_baltst_myenumeration.cpp b/standalones/s_baltst/s_baltst_myenumeration.cpp index 4bb413034e..12a1bfc620 100644 --- a/standalones/s_baltst/s_baltst_myenumeration.cpp +++ b/standalones/s_baltst/s_baltst_myenumeration.cpp @@ -91,7 +91,7 @@ const char *MyEnumeration::toString(MyEnumeration::Value value) } } - BSLS_ASSERT(!"invalid enumerator"); + BSLS_ASSERT(0 == "invalid enumerator"); return 0; } diff --git a/standalones/s_baltst/s_baltst_myenumerationunpreservedwithfallback.cpp b/standalones/s_baltst/s_baltst_myenumerationunpreservedwithfallback.cpp index aa8e56b50f..d3d66b6323 100644 --- a/standalones/s_baltst/s_baltst_myenumerationunpreservedwithfallback.cpp +++ b/standalones/s_baltst/s_baltst_myenumerationunpreservedwithfallback.cpp @@ -101,7 +101,7 @@ const char *MyEnumerationUnpreservedWithFallback::toString(MyEnumerationUnpreser } } - BSLS_ASSERT(!"invalid enumerator"); + BSLS_ASSERT(0 == "invalid enumerator"); return 0; } diff --git a/standalones/s_baltst/s_baltst_myenumerationwithfallback.cpp b/standalones/s_baltst/s_baltst_myenumerationwithfallback.cpp index 2ff8381b27..b6dd9b0f83 100644 --- a/standalones/s_baltst/s_baltst_myenumerationwithfallback.cpp +++ b/standalones/s_baltst/s_baltst_myenumerationwithfallback.cpp @@ -107,7 +107,7 @@ const char *MyEnumerationWithFallback::toString(MyEnumerationWithFallback::Value } } - BSLS_ASSERT(!"invalid enumerator"); + BSLS_ASSERT(0 == "invalid enumerator"); return 0; }