summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorDavid Kalnischkies <david@kalnischkies.de>2015-07-09 00:35:40 +0200
committerDavid Kalnischkies <david@kalnischkies.de>2015-08-10 17:27:17 +0200
commit3b3028467ceccca0b73a8f53051c0fa4de313111 (patch)
treeff51789a82630e3fb61a25f8b7c970854b753dc9 /test
parent2893325927f6e4d55dc4bd148093351d4f8300f9 (diff)
add c++11 override marker to overridden methods
C++11 adds the 'override' specifier to mark that a method is overriding a base class method and error out if not. We hide it in the APT_OVERRIDE macro to ensure that we keep compiling in pre-c++11 standards. Reported-By: clang-modernize -add-override -override-macros Git-Dch: Ignore
Diffstat (limited to 'test')
-rw-r--r--test/interactive-helper/testdeb.cc2
-rw-r--r--test/libapt/acqprogress_test.cc4
-rw-r--r--test/libapt/indexcopytosourcelist_test.cc8
3 files changed, 7 insertions, 7 deletions
diff --git a/test/interactive-helper/testdeb.cc b/test/interactive-helper/testdeb.cc
index 6aae9f563..69e1ffe0b 100644
--- a/test/interactive-helper/testdeb.cc
+++ b/test/interactive-helper/testdeb.cc
@@ -13,7 +13,7 @@
class NullStream : public pkgDirStream
{
public:
- virtual bool DoItem(Item &/*Itm*/, int &/*Fd*/) {return true;};
+ virtual bool DoItem(Item &/*Itm*/, int &/*Fd*/) APT_OVERRIDE {return true;};
};
static bool Test(const char *File)
diff --git a/test/libapt/acqprogress_test.cc b/test/libapt/acqprogress_test.cc
index dc31423fc..50792528d 100644
--- a/test/libapt/acqprogress_test.cc
+++ b/test/libapt/acqprogress_test.cc
@@ -13,8 +13,8 @@ class TestItem: public pkgAcquire::Item
public:
TestItem(pkgAcquire * const Acq) : pkgAcquire::Item(Acq) {}
- virtual std::string DescURI() const { return ""; }
- virtual HashStringList GetExpectedHashes() const { return HashStringList(); }
+ virtual std::string DescURI() const APT_OVERRIDE { return ""; }
+ virtual HashStringList GetExpectedHashes() const APT_OVERRIDE { return HashStringList(); }
};
diff --git a/test/libapt/indexcopytosourcelist_test.cc b/test/libapt/indexcopytosourcelist_test.cc
index 1b0427564..2d07dba15 100644
--- a/test/libapt/indexcopytosourcelist_test.cc
+++ b/test/libapt/indexcopytosourcelist_test.cc
@@ -15,10 +15,10 @@ class NoCopy : public IndexCopy {
IndexCopy::ConvertToSourceList(CD, Path);
return Path;
}
- bool GetFile(std::string &/*Filename*/, unsigned long long &/*Size*/) { return false; }
- bool RewriteEntry(FileFd & /*Target*/, std::string const &/*File*/) { return false; }
- const char *GetFileName() { return NULL; }
- const char *Type() { return NULL; }
+ bool GetFile(std::string &/*Filename*/, unsigned long long &/*Size*/) APT_OVERRIDE { return false; }
+ bool RewriteEntry(FileFd & /*Target*/, std::string const &/*File*/) APT_OVERRIDE { return false; }
+ const char *GetFileName() APT_OVERRIDE { return NULL; }
+ const char *Type() APT_OVERRIDE { return NULL; }
};