From dca25268793a58b005c14c5c6fd0195ef1ec6098 Mon Sep 17 00:00:00 2001 From: casey langen Date: Mon, 4 Dec 2017 00:12:21 +0000 Subject: [PATCH] Fixed compiler errors and warning that showed up on Debian Stretch. --- src/core/library/LocalSimpleDataProvider.cpp | 4 ++-- src/core/sdk/IPreferences.h | 2 ++ src/core/support/Preferences.h | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/core/library/LocalSimpleDataProvider.cpp b/src/core/library/LocalSimpleDataProvider.cpp index 3b8ff9b7c..df22f6106 100644 --- a/src/core/library/LocalSimpleDataProvider.cpp +++ b/src/core/library/LocalSimpleDataProvider.cpp @@ -90,7 +90,7 @@ class ExternalIdListToTrackListQuery : public TrackListQueryBase { } protected: - virtual bool OnRun(musik::core::db::Connection& db) { + virtual bool OnRun(musik::core::db::Connection& db) override { std::string sql = "SELECT id, external_id FROM tracks WHERE external_id IN("; for (size_t i = 0; i < externalIdCount; i++) { sql += (i == 0) ? "?" : ",?"; @@ -128,7 +128,7 @@ class ExternalIdListToTrackListQuery : public TrackListQueryBase { return true; } - virtual std::string Name() { + virtual std::string Name() override { return "ExternalIdListToTrackListQuery"; } diff --git a/src/core/sdk/IPreferences.h b/src/core/sdk/IPreferences.h index 7253e57e9..5c5f6fbe4 100644 --- a/src/core/sdk/IPreferences.h +++ b/src/core/sdk/IPreferences.h @@ -34,6 +34,8 @@ #pragma once +#include + namespace musik { namespace core { namespace sdk { class IPreferences { diff --git a/src/core/support/Preferences.h b/src/core/support/Preferences.h index cb2b255e8..0810418f9 100644 --- a/src/core/support/Preferences.h +++ b/src/core/support/Preferences.h @@ -79,7 +79,7 @@ namespace musik { namespace core { virtual void SetDouble(const char* key, double value) override; virtual void SetString(const char* key, const char* value) override; - virtual void Save(); + virtual void Save() override; /* easier interface for internal use */ virtual bool GetBool(const std::string& key, bool defaultValue = false);