Skip to content

Commit f99b265

Browse files
committed
C++20: Fix -Wvolatile warnings
C++20 has completely deprecated `volatile`, and GCC enables multiple warnings to catch invalid volatile uses. Signed-off-by: Taylor Foxhall <[email protected]>
1 parent 522a01c commit f99b265

File tree

2 files changed

+3
-23
lines changed

2 files changed

+3
-23
lines changed

src/groups/mwc/mwcsys/mwcsys_statmonitorsnapshotrecorder.t.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,13 @@ int doWork_cpuIntensive()
7777
volatile unsigned int sum = 0;
7878
for (int i = 0; i < (k_1K * multiplier); ++i) {
7979
volatile int a = 50 * 9873 / 3;
80-
sum += a;
80+
sum = sum + a;
8181

8282
volatile int b = a * (a ^ (~0U));
83-
sum += b;
83+
sum = sum + b;
8484

8585
volatile int c = (a * (b ^ (~0U))) % 999983;
86-
sum += c;
86+
sum = sum + c;
8787
}
8888

8989
return sum;

src/groups/mwc/mwcu/mwcu_weakmemfn.t.cpp

-20
Original file line numberDiff line numberDiff line change
@@ -105,16 +105,6 @@ static void test1_weakMemFn_resultType()
105105
(bsl::is_same<mwcu::WeakMemFnResult<const R>,
106106
mwcu::WeakMemFn<const R (C::*)()>::ResultType>::value));
107107

108-
// volatile R -> mwcu::WeakMemFnResult<volatile R>
109-
ASSERT((bsl::is_same<
110-
mwcu::WeakMemFnResult<volatile R>,
111-
mwcu::WeakMemFn<volatile R (C::*)()>::ResultType>::value));
112-
113-
// const volatile R -> mwcu::WeakMemFnResult<const volatile R>
114-
ASSERT((bsl::is_same<
115-
mwcu::WeakMemFnResult<const volatile R>,
116-
mwcu::WeakMemFn<const volatile R (C::*)()>::ResultType>::value));
117-
118108
// R& -> mwcu::WeakMemFnResult<R&>
119109
ASSERT((bsl::is_same<mwcu::WeakMemFnResult<R&>,
120110
mwcu::WeakMemFn<R& (C::*)()>::ResultType>::value));
@@ -244,16 +234,6 @@ static void test3_weakMemFnInstance_resultType()
244234
mwcu::WeakMemFnResult<const R>,
245235
mwcu::WeakMemFnInstance<const R (C::*)()>::ResultType>::value));
246236

247-
// volatile R -> mwcu::WeakMemFnResult<volatile R>
248-
ASSERT((bsl::is_same<
249-
mwcu::WeakMemFnResult<volatile R>,
250-
mwcu::WeakMemFnInstance<volatile R (C::*)()>::ResultType>::value));
251-
252-
// const volatile R -> mwcu::WeakMemFnResult<const volatile R>
253-
ASSERT((bsl::is_same<mwcu::WeakMemFnResult<const volatile R>,
254-
mwcu::WeakMemFnInstance<const volatile R (
255-
C::*)()>::ResultType>::value));
256-
257237
// R& -> mwcu::WeakMemFnResult<R&>
258238
ASSERT((bsl::is_same<
259239
mwcu::WeakMemFnResult<R&>,

0 commit comments

Comments
 (0)