From a5941254a10264cbd7a35dd31306873d92bdaf82 Mon Sep 17 00:00:00 2001 From: Guilherme Amadio Date: Wed, 12 Apr 2023 16:40:11 +0200 Subject: [PATCH] [Tests] Change name of macro local variable to avoid clashes The name st is used extensively throughout the code, so using the same name here can cause shadowing problems or hide typos like the one fixed in the previous commit. --- tests/common/CppUnitXrdHelpers.hh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/common/CppUnitXrdHelpers.hh b/tests/common/CppUnitXrdHelpers.hh index 99925bb2726..b4634433133 100644 --- a/tests/common/CppUnitXrdHelpers.hh +++ b/tests/common/CppUnitXrdHelpers.hh @@ -25,18 +25,18 @@ #define CPPUNIT_ASSERT_XRDST_NOTOK( x, err ) \ { \ - XrdCl::XRootDStatus st = x; \ + XrdCl::XRootDStatus _st = x; \ std::string msg = "["; msg += #x; msg += "]: "; \ - msg += st.ToStr(); \ - CPPUNIT_ASSERT_MESSAGE( msg, !st.IsOK() && st.code == err ); \ + msg += _st.ToStr(); \ + CPPUNIT_ASSERT_MESSAGE( msg, !_st.IsOK() && _st.code == err ); \ } #define CPPUNIT_ASSERT_XRDST( x ) \ { \ - XrdCl::XRootDStatus st = x; \ + XrdCl::XRootDStatus _st = x; \ std::string msg = "["; msg += #x; msg += "]: "; \ - msg += st.ToStr(); \ - CPPUNIT_ASSERT_MESSAGE( msg, st.IsOK() ); \ + msg += _st.ToStr(); \ + CPPUNIT_ASSERT_MESSAGE( msg, _st.IsOK() ); \ } #define CPPUNIT_ASSERT_ERRNO( x ) \