diff --git a/test/unit/mem/view/src/ViewPlainPtrTest.cpp b/test/unit/mem/view/src/ViewPlainPtrTest.cpp index 6113b53f147c..1552b5bc3e0e 100644 --- a/test/unit/mem/view/src/ViewPlainPtrTest.cpp +++ b/test/unit/mem/view/src/ViewPlainPtrTest.cpp @@ -34,18 +34,18 @@ namespace alpaka::test auto const platform = alpaka::Platform{}; auto const dev = alpaka::getDevByIdx(platform, 0); - auto const extentBuf = alpaka::test::extentBuf; - auto buf = alpaka::allocBuf(dev, extentBuf); + auto const bufExtent = alpaka::test::extentBuf; + auto buf = alpaka::allocBuf(dev, bufExtent); - auto const extentView = extentBuf; - auto const offsetView = alpaka::Vec::all(static_cast(0)); + auto const viewExtent = bufExtent; + auto const viewOffset = alpaka::Vec::all(static_cast(0)); View view( alpaka::getPtrNative(buf), alpaka::getDev(buf), alpaka::getExtents(buf), alpaka::getPitchesInBytes(buf)); - alpaka::test::testViewImmutable(std::as_const(view), dev, extentView, offsetView); + alpaka::test::testViewImmutable(std::as_const(view), dev, viewExtent, viewOffset); if constexpr(!Const) { using Queue = alpaka::test::DefaultQueue; diff --git a/test/unit/mem/view/src/ViewSubViewTest.cpp b/test/unit/mem/view/src/ViewSubViewTest.cpp index 02e7267b529a..6da699082dbd 100644 --- a/test/unit/mem/view/src/ViewSubViewTest.cpp +++ b/test/unit/mem/view/src/ViewSubViewTest.cpp @@ -1,4 +1,4 @@ -/* Copyright 2022 Axel Huebl, Benjamin Worpitz, Erik Zenker, Bernhard Manfred Gruber, Jan Stephan +/* Copyright 2023 Axel Hübl, Benjamin Worpitz, Erik Zenker, Bernhard Manfred Gruber, Jan Stephan * SPDX-License-Identifier: MPL-2.0 */ @@ -78,14 +78,14 @@ namespace alpaka::test auto const platform = alpaka::Platform{}; auto const dev = alpaka::getDevByIdx(platform, 0); - auto const extentBuf = alpaka::test::extentBuf; - auto buf = alpaka::allocBuf(dev, extentBuf); + auto const bufExtent = alpaka::test::extentBuf; + auto buf = alpaka::allocBuf(dev, bufExtent); - auto const extentView = extentBuf; - auto const offsetView = alpaka::Vec::zeros(); + auto const viewExtent = bufExtent; + auto const viewOffset = alpaka::Vec::zeros(); View view(buf); - alpaka::test::testViewSubViewMutable(view, buf, dev, extentView, offsetView); + alpaka::test::testViewSubViewMutable(view, buf, dev, viewExtent, viewOffset); } template @@ -99,14 +99,14 @@ namespace alpaka::test auto const platform = alpaka::Platform{}; auto const dev = alpaka::getDevByIdx(platform, 0); - auto const extentBuf = alpaka::test::extentBuf; - auto buf = alpaka::allocBuf(dev, extentBuf); + auto const bufExtent = alpaka::test::extentBuf; + auto buf = alpaka::allocBuf(dev, bufExtent); - auto const extentView = alpaka::test::extentSubView; - auto const offsetView = alpaka::test::offset; - View view(buf, extentView, offsetView); + auto const viewExtent = alpaka::test::extentSubView; + auto const viewOffset = alpaka::test::offset; + View view(buf, viewExtent, viewOffset); - alpaka::test::testViewSubViewMutable(view, buf, dev, extentView, offsetView); + alpaka::test::testViewSubViewMutable(view, buf, dev, viewExtent, viewOffset); } template @@ -120,14 +120,14 @@ namespace alpaka::test auto const platform = alpaka::Platform{}; auto const dev = alpaka::getDevByIdx(platform, 0); - auto const extentBuf = alpaka::test::extentBuf; - auto buf = alpaka::allocBuf(dev, extentBuf); + auto const bufExtent = alpaka::test::extentBuf; + auto buf = alpaka::allocBuf(dev, bufExtent); - auto const extentView = alpaka::test::extentSubView; - auto const offsetView = alpaka::test::offset; - View const view(buf, extentView, offsetView); + auto const viewExtent = alpaka::test::extentSubView; + auto const viewOffset = alpaka::test::offset; + View const view(buf, viewExtent, viewOffset); - alpaka::test::testViewSubViewImmutable(view, buf, dev, extentView, offsetView); + alpaka::test::testViewSubViewImmutable(view, buf, dev, viewExtent, viewOffset); } } // namespace alpaka::test #if BOOST_COMP_GNUC