summaryrefslogtreecommitdiff
path: root/methods/ftp.h
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 /methods/ftp.h
parent2893325927f6e4d55dc4bd148093351d4f8300f9 (diff)
downloadapt-3b3028467ceccca0b73a8f53051c0fa4de313111.tar.gz
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 'methods/ftp.h')
-rw-r--r--methods/ftp.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/methods/ftp.h b/methods/ftp.h
index 2efd28ec6..2c4e9f57a 100644
--- a/methods/ftp.h
+++ b/methods/ftp.h
@@ -10,8 +10,10 @@
#ifndef APT_FTP_H
#define APT_FTP_H
+#include <apt-pkg/acquire-method.h>
#include <apt-pkg/strutl.h>
+#include <sys/socket.h>
#include <sys/types.h>
#include <time.h>
#include <string>
@@ -71,8 +73,8 @@ class FTPConn
class FtpMethod : public pkgAcqMethod
{
- virtual bool Fetch(FetchItem *Itm);
- virtual bool Configuration(std::string Message);
+ virtual bool Fetch(FetchItem *Itm) APT_OVERRIDE;
+ virtual bool Configuration(std::string Message) APT_OVERRIDE;
FTPConn *Server;