diff --git a/projects/rocthrust/test/test_copy.cpp b/projects/rocthrust/test/test_copy.cpp index 27b7818b9ba..9cc00493017 100644 --- a/projects/rocthrust/test/test_copy.cpp +++ b/projects/rocthrust/test/test_copy.cpp @@ -430,7 +430,7 @@ TYPED_TEST(CopyIntegerTests, TestCopyIf) TEST(CopyLargeTypesTests, TestCopyIfStencilLargeType) { - using T = large_data; + using T = test::large_data; SCOPED_TRACE(testing::Message() << "with device_id= " << test::set_device_from_ctest()); diff --git a/projects/rocthrust/test/test_header.hpp b/projects/rocthrust/test/test_header.hpp index 20682ef75c6..d2f0d4717fa 100644 --- a/projects/rocthrust/test/test_header.hpp +++ b/projects/rocthrust/test/test_header.hpp @@ -197,7 +197,8 @@ struct Params, ExecutionPolicy> TYPED_TEST_SUITE(x, y); // Set of test parameter types - +namespace test +{ class large_data { public: @@ -240,6 +241,7 @@ bool __host__ __device__ operator==(T const& lhs, large_data const& rhs) { return static_cast(lhs).data[0] == rhs.data[0]; } +} // namespace test // Host and device vectors of all type as a test parameter using FullTestsParams = ::testing::Types< @@ -283,7 +285,7 @@ using FullWithLargeTypesTestsParams = ::testing::Types< Params, std::decay_t>, Params, std::decay_t>, Params>, - Params>>; + Params>>; // Host and device vectors of signed type using VectorSignedTestsParams =