From f6c9dcfed1371534bfb4da7b8547919948369773 Mon Sep 17 00:00:00 2001 From: Kelly Ledford Date: Thu, 27 Jul 2017 15:20:53 -0700 Subject: [PATCH] test: fix GCC 7.1.1 warnings/errors Fixes #52: add explicit braces to avoid 'ambiguous else' warning. Signed-off-by: Kelly Ledford --- test/test_va_api_fixture.cpp | 3 ++- test/test_va_api_init_terminate.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/test/test_va_api_fixture.cpp b/test/test_va_api_fixture.cpp index a4af0b1..78938e7 100644 --- a/test/test_va_api_fixture.cpp +++ b/test/test_va_api_fixture.cpp @@ -89,8 +89,9 @@ VADisplay VAAPIFixture::doInitialize() vaDisplay = getDisplay(); EXPECT_TRUE(vaDisplay); - if (vaDisplay) + if (vaDisplay) { EXPECT_STATUS(vaInitialize(vaDisplay, &majorVersion, &minorVersion)); + } return vaDisplay; } diff --git a/test/test_va_api_init_terminate.cpp b/test/test_va_api_init_terminate.cpp index beef906..dac8314 100644 --- a/test/test_va_api_init_terminate.cpp +++ b/test/test_va_api_init_terminate.cpp @@ -38,8 +38,9 @@ void VAAPIInitTerminate::doInitTerminate() vaDisplay = getDisplay(); EXPECT_TRUE(vaDisplay); - if (vaDisplay) + if (vaDisplay) { ASSERT_STATUS(vaInitialize(vaDisplay, &majorVersion, &minorVersion)); + } EXPECT_EQ(VA_MAJOR_VERSION, majorVersion) << "Check installed driver version";