Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-24 01:31:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix compilation with GCC 8 (#1051)

Browse Source 
The anonymous namespace was renamed due to -Wsubobject-linkage complaining
about a field created in a GTest template class (CborRoundtripTestParam)
being defined in an anonymous namespace. See
https://stackoverflow.com/a/37723265.
This commit is contained in:
Tyler Veness
2018-05-13 23:11:13 -07:00
committed by Peter Johnson
parent 74d7107ac6
commit 5ff3d837b6
3 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
wpiutil/src/test/native/cpp/json/unit-cbor.cpp
View File

@@ -1568,16 +1568,16 @@ TEST(CborFirstBytesTest, Unsupported)
}
// examples from RFC 7049 Appendix A
namespace {
namespace internal {
struct CborRoundtripTestParam {
const char* plain;
wpi::StringRef encoded;
bool test_encode;
};
} // anonymous namespace
} // namespace internal
class CborRoundtripTest
: public ::testing::TestWithParam<CborRoundtripTestParam> {
: public ::testing::TestWithParam<internal::CborRoundtripTestParam> {
};
TEST_P(CborRoundtripTest, Case)
{
@@ -1588,7 +1588,7 @@ TEST_P(CborRoundtripTest, Case)
EXPECT_EQ(json::parse(GetParam().plain), json::from_cbor(GetParam().encoded));
}
static const CborRoundtripTestParam rfc7049_appendix_a_numbers[] = {
static const internal::CborRoundtripTestParam rfc7049_appendix_a_numbers[] = {
{"0", wpi::StringRef("\x00", 1), true},
{"1", "\x01", true},
{"10", "\x0a", true},
@@ -1635,7 +1635,7 @@ static const CborRoundtripTestParam rfc7049_appendix_a_numbers[] = {
INSTANTIATE_TEST_CASE_P(CborRfc7049AppendixANumberTests, CborRoundtripTest,
::testing::ValuesIn(rfc7049_appendix_a_numbers), );
static const CborRoundtripTestParam rfc7049_appendix_a_simple_values[] = {
static const internal::CborRoundtripTestParam rfc7049_appendix_a_simple_values[] = {
{"false", "\xf4", true},
{"true", "\xf5", true},
};
@@ -1643,7 +1643,7 @@ static const CborRoundtripTestParam rfc7049_appendix_a_simple_values[] = {
INSTANTIATE_TEST_CASE_P(CborRfc7049AppendixASimpleValueTests, CborRoundtripTest,
::testing::ValuesIn(rfc7049_appendix_a_simple_values), );
static const CborRoundtripTestParam rfc7049_appendix_a_strings[] = {
static const internal::CborRoundtripTestParam rfc7049_appendix_a_strings[] = {
{"\"\"", "\x60", true},
{"\"a\"", "\x61\x61", true},
{"\"IETF\"", "\x64\x49\x45\x54\x46", true},
@@ -1657,7 +1657,7 @@ static const CborRoundtripTestParam rfc7049_appendix_a_strings[] = {
INSTANTIATE_TEST_CASE_P(CborRfc7049AppendixAStringTests, CborRoundtripTest,
::testing::ValuesIn(rfc7049_appendix_a_strings), );
static const CborRoundtripTestParam rfc7049_appendix_a_arrays[] = {
static const internal::CborRoundtripTestParam rfc7049_appendix_a_arrays[] = {
{"[]", "\x80", true},
{"[1, 2, 3]", "\x83\x01\x02\x03", true},
{"[1, [2, 3], [4, 5]]", "\x83\x01\x82\x02\x03\x82\x04\x05", true},
@@ -1674,7 +1674,7 @@ static const CborRoundtripTestParam rfc7049_appendix_a_arrays[] = {
INSTANTIATE_TEST_CASE_P(CborRfc7049AppendixAArrayTests, CborRoundtripTest,
::testing::ValuesIn(rfc7049_appendix_a_arrays), );
static const CborRoundtripTestParam rfc7049_appendix_a_objects[] = {
static const internal::CborRoundtripTestParam rfc7049_appendix_a_objects[] = {
{"{}", "\xa0", true},
{"{\"a\": 1, \"b\": [2, 3]}", "\xa2\x61\x61\x01\x61\x62\x82\x02\x03", true},
{"[\"a\", {\"b\": \"c\"}]", "\x82\x61\x61\xa1\x61\x62\x61\x63", true},

2
wpiutil/src/test/native/cpp/json/unit-unicode.cpp
View File

@@ -70,7 +70,7 @@ using wpi::json;
try {
json::parse(json_string);
} catch (json::parse_error) {
} catch (json::parse_error&) {
if (success_expected)
{
basemsg = "parse_error";