Skip to content

Fix ambiguous constructor #85

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
solidpixel merged 2 commits into from
Jan 24, 2025
Merged

Fix ambiguous constructor #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3b1f555
Fix ambiguous constructor
solidpixel Jan 24, 2025
002f6b5
Fix copyright
solidpixel Jan 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions hwcpipe/include/hwcpipe/sampler.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2023-2024 Arm Limited.
* Copyright (c) 2023-2025 Arm Limited.
*
* SPDX-License-Identifier: MIT
*/
Expand Down Expand Up @@ -75,7 +75,7 @@ struct counter_sample {

/** Default constructor */
counter_sample()
: counter_sample(hwcpipe_counter(), 0, 0UL) {}
: counter_sample(hwcpipe_counter(), 0, static_cast<uint64_t>(0UL)) {}
};

/**
Expand Down
16 changes: 13 additions & 3 deletions test/counter-sampler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2023-2024 Arm Limited.
* Copyright (c) 2023-2025 Arm Limited.
*
* SPDX-License-Identifier: MIT
*/
Expand Down Expand Up @@ -44,12 +44,22 @@ struct hwcpipe_sampler_mock_policy {
using namespace hwcpipe::mock;
using sampler_t = hwcpipe::sampler<hwcpipe_sampler_mock_policy>;

TEST_CASE("counter_sampler__DefaultConstructor") {
SECTION("uint64") {
counter_sample sample;

REQUIRE(sample.timestamp == 0);
REQUIRE(sample.value.uint64 == static_cast<uint64_t>(0UL));
REQUIRE(sample.type == counter_sample::type::uint64);
}
}

TEST_CASE("counter_sampler__CorrectTypesAreAssigned") {
SECTION("uint64") {
counter_sample sample{hwcpipe_counter(), 0xbaadcafe, 42UL};
counter_sample sample{hwcpipe_counter(), 0xbaadcafe, static_cast<uint64_t>(42UL)};

REQUIRE(sample.timestamp == 0xbaadcafe);
REQUIRE(sample.value.uint64 == 42);
REQUIRE(sample.value.uint64 == static_cast<uint64_t>(42));
REQUIRE(sample.type == counter_sample::type::uint64);
}

Expand Down