aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMika Väinölä <33728696+mvainola@users.noreply.github.com>2020-10-27 15:27:00 +0200
committerGitHub <noreply@github.com>2020-10-27 09:27:00 -0400
commit4d0115cccfcb3b73d20b6513b1c40748e6403c50 (patch)
tree76c7f0d5062b90de62b9ef1275b0f171e7d281cd
parent1d7aa344dd8c1aa7a0a7673157fa7dcaa7864bd3 (diff)
downloadamber-4d0115cccfcb3b73d20b6513b1c40748e6403c50.tar.gz
Fix build on Clang 11 (#917)
Explicitly specify some destructor overrides to suppress `-Wsuggest-destructor-override` warnings on Clang 11.
-rw-r--r--src/command.h2
-rw-r--r--src/debug.h4
-rw-r--r--src/engine.h2
-rw-r--r--src/executor_test.cc2
-rw-r--r--src/verifier_test.cc2
-rw-r--r--src/vulkan/vertex_buffer_test.cc2
6 files changed, 7 insertions, 7 deletions
diff --git a/src/command.h b/src/command.h
index c1fd6d2..c6c7e08 100644
--- a/src/command.h
+++ b/src/command.h
@@ -471,7 +471,7 @@ class ProbeSSBOCommand : public Probe {
class BindableResourceCommand : public PipelineCommand {
public:
BindableResourceCommand(Type type, Pipeline* pipeline);
- virtual ~BindableResourceCommand();
+ ~BindableResourceCommand() override;
void SetDescriptorSet(uint32_t set) { descriptor_set_ = set; }
uint32_t GetDescriptorSet() const { return descriptor_set_; }
diff --git a/src/debug.h b/src/debug.h
index 25d0625..4da0d91 100644
--- a/src/debug.h
+++ b/src/debug.h
@@ -125,7 +125,7 @@ class Events {
/// with |ThreadScript::Run|.
class ThreadScript : public Thread {
public:
- ~ThreadScript();
+ ~ThreadScript() override;
/// Run replays all the calls made to the |ThreadScript| on the given |Thread|
/// parameter.
@@ -140,7 +140,7 @@ class ThreadScript : public Thread {
/// |Script::Run|.
class Script : public Events {
public:
- ~Script();
+ ~Script() override;
/// Run replays all the calls made to the |Script| on the given |Events|
/// parameter.
diff --git a/src/engine.h b/src/engine.h
index 5419ca9..7819b07 100644
--- a/src/engine.h
+++ b/src/engine.h
@@ -59,7 +59,7 @@ class Engine {
/// Debugger is the interface to the engine's shader debugger.
class Debugger : public debug::Events {
public:
- ~Debugger();
+ ~Debugger() override;
/// Flush waits for all the debugger commands issued to complete, and
/// returns a Result that includes any debugger test failure.
diff --git a/src/executor_test.cc b/src/executor_test.cc
index 6a35d9e..859c244 100644
--- a/src/executor_test.cc
+++ b/src/executor_test.cc
@@ -207,7 +207,7 @@ class EngineStub : public Engine {
class VkScriptExecutorTest : public testing::Test {
public:
VkScriptExecutorTest() = default;
- ~VkScriptExecutorTest() = default;
+ ~VkScriptExecutorTest() override = default;
std::unique_ptr<Engine> MakeEngine() { return MakeUnique<EngineStub>(); }
std::unique_ptr<Engine> MakeAndInitializeEngine(
diff --git a/src/verifier_test.cc b/src/verifier_test.cc
index f3fb82c..d550e29 100644
--- a/src/verifier_test.cc
+++ b/src/verifier_test.cc
@@ -34,7 +34,7 @@ namespace {
class VerifierTest : public testing::Test {
public:
VerifierTest() = default;
- ~VerifierTest() = default;
+ ~VerifierTest() override = default;
const Format* GetColorFormat() {
if (color_frame_format_)
diff --git a/src/vulkan/vertex_buffer_test.cc b/src/vulkan/vertex_buffer_test.cc
index 2691557..914933e 100644
--- a/src/vulkan/vertex_buffer_test.cc
+++ b/src/vulkan/vertex_buffer_test.cc
@@ -144,7 +144,7 @@ class VertexBufferTest : public testing::Test {
commandBuffer_->Initialize();
}
- ~VertexBufferTest() { vertex_buffer_.reset(); }
+ ~VertexBufferTest() override { vertex_buffer_.reset(); }
Result SetData(uint8_t location, Format* format, std::vector<Value> values) {
auto buffer = MakeUnique<Buffer>();