Skip to content

Commit

Permalink
🔨 Remove exit-time destructors
Browse files Browse the repository at this point in the history 
Some compilers on higher warning levels complain about global objects
with exit-time destructors. Some unit tests declared global std::string
objects as a convenience, which tripped these warnings.

Even though this is just in the unit tests, it would be ideal to not
have any errors at all -- and so this has been addressed.
  • Loading branch information
@bitwizeshift
bitwizeshift committed Mar 5, 2020
1 parent 43b3561 commit 3046d07
Showing 1 changed file with 18 additions and 20 deletions.
38 changes: 18 additions & 20 deletions test/src/bpstd/any.test.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,12 @@ namespace {
// A testing string that is sufficiently long enough to avoid string SBO.
// This is used so that MSAN & LSAN can validate memory issues
const auto string_value = // NOLINT
std::string{
"Lorem ipsum dolor sit amet, consectetur adipiscing elit. "
"Cras consequat et augue auctor porttitor."
};
"Lorem ipsum dolor sit amet, consectetur adipiscing elit. "
"Cras consequat et augue auctor porttitor.";

struct large_object
{
large_object() noexcept : buffer{}{};
large_object() noexcept : buffer{}{}
large_object( std::string value ) : value{ std::move(value) }, buffer{}{}
large_object( large_object&& other ) = default;
large_object( const large_object& other ) = default;
Expand Down Expand Up @@ -84,7 +82,7 @@ TEST_CASE("any::any( any&& )","[ctor]")
{
SECTION("Source contains value")
{
auto original = bpstd::any{::string_value};
auto original = bpstd::any{std::string{::string_value}};
auto& original_type = original.type();

auto moved = std::move(original);
Expand All @@ -99,7 +97,7 @@ TEST_CASE("any::any( any&& )","[ctor]")
}
SECTION("Contains same value")
{
REQUIRE( bpstd::any_cast<std::string>(moved) == ::string_value );
REQUIRE( bpstd::any_cast<std::string>(moved) == std::string{::string_value} );
}
}
SECTION("Source does not contain value")
Expand All @@ -123,7 +121,7 @@ TEST_CASE("any::any( const any& )","[ctor]")
{
SECTION("Source contains value")
{
auto original = bpstd::any{::string_value};
auto original = bpstd::any{std::string{::string_value}};
auto& original_type = original.type();

auto copy = original;
Expand All @@ -138,7 +136,7 @@ TEST_CASE("any::any( const any& )","[ctor]")
}
SECTION("Contains same value")
{
REQUIRE( bpstd::any_cast<std::string>(copy) == ::string_value );
REQUIRE( bpstd::any_cast<std::string>(copy) == std::string{::string_value} );
}
}
SECTION("Source does not contain value")
Expand Down Expand Up @@ -182,7 +180,7 @@ TEST_CASE("any::any( ValueType&& )","[ctor]")

TEST_CASE("any::any( in_place_type_t<ValueType>, Args&&... )","[ctor]")
{
const auto value = ::string_value;
const auto value = std::string{::string_value};
const auto expected = std::string{value,2,7};

auto a = bpstd::any{ bpstd::in_place_type_t<std::string>{}, value, 2, 7 };
Expand Down Expand Up @@ -230,7 +228,7 @@ TEST_CASE("any::operator=( any&& )","[assignment]")
}
SECTION("Source contains a value")
{
const auto value = ::string_value;
const auto value = std::string{::string_value};
auto source = bpstd::any{value};

destination = std::move(source);
Expand Down Expand Up @@ -266,7 +264,7 @@ TEST_CASE("any::operator=( any&& )","[assignment]")
}
SECTION("Source contains a value")
{
const auto value = ::string_value;
const auto value = std::string{::string_value};
auto source = bpstd::any{value};

destination = std::move(source);
Expand Down Expand Up @@ -306,7 +304,7 @@ TEST_CASE("any::operator=( const any& )","[assignment]")
}
SECTION("Source contains a value")
{
const auto value = ::string_value;
const auto value = std::string{::string_value};
auto source = bpstd::any{value};

destination = source;
Expand Down Expand Up @@ -342,7 +340,7 @@ TEST_CASE("any::operator=( const any& )","[assignment]")
}
SECTION("Source contains a value")
{
const auto value = ::string_value;
const auto value = std::string{::string_value};
auto source = bpstd::any{value};

destination = source;
Expand All @@ -367,7 +365,7 @@ TEST_CASE("any::operator=( ValueType&& )","[assignment]")
{
SECTION("Destination contains a value")
{
const auto value = ::string_value;
const auto value = std::string{::string_value};
auto original = bpstd::any{5};

original = value;
Expand All @@ -389,7 +387,7 @@ TEST_CASE("any::operator=( ValueType&& )","[assignment]")
{
auto original = bpstd::any{};

const auto value = ::string_value;
const auto value = std::string{::string_value};

original = value;

Expand Down Expand Up @@ -499,7 +497,7 @@ TEST_CASE("any::emplace( Args&&... )","[modifiers]")

SECTION("new value fits in small buffer")
{
const auto lhs_value = ::string_value;
const auto lhs_value = std::string{::string_value};

lhs.emplace<std::string>(lhs_value);

Expand All @@ -514,7 +512,7 @@ TEST_CASE("any::emplace( Args&&... )","[modifiers]")
}
SECTION("new value does not fit in small buffer")
{
const auto lhs_value = ::string_value;
const auto lhs_value = std::string{::string_value};

lhs.emplace<::large_object>(lhs_value);

Expand All @@ -532,7 +530,7 @@ TEST_CASE("any::emplace( Args&&... )","[modifiers]")
{
SECTION("new value fits in small buffer")
{
const auto lhs_value = ::string_value;
const auto lhs_value = std::string{::string_value};
auto lhs = bpstd::any{};

lhs.emplace<std::string>( lhs_value );
Expand All @@ -544,7 +542,7 @@ TEST_CASE("any::emplace( Args&&... )","[modifiers]")
}
SECTION("new value does not fit in small buffer")
{
const auto lhs_value = ::string_value;
const auto lhs_value = std::string{::string_value};
auto lhs = bpstd::any{};

lhs.emplace<::large_object>( lhs_value );
Expand Down

0 comments on commit 3046d07

Please sign in to comment.