1
0
Fork 0

missing overrides

This commit is contained in:
Kaveh Vahedipour 2016-03-23 17:39:16 +01:00
parent 7746fbfe82
commit 90a085975d
9 changed files with 20 additions and 23 deletions

View File

@ -213,8 +213,6 @@ unsigned int const Slice::FirstSubMap[32] = {
8, // 0x12, object with unsorted index table
0};
static char const* NullStr = "0x18";
// creates a Slice from Json and adds it to a scope
Slice Slice::fromJson(SliceScope& scope, std::string const& json,
Options const* options) {

View File

@ -39,7 +39,6 @@ ApplicationAgency::ApplicationAgency()
_max_election_timeout(2.0), _election_call_rate_mul(2.5),
_append_entries_retry_interval(1.0),
_agent_id(std::numeric_limits<uint32_t>::max()) {
}

View File

@ -53,9 +53,9 @@ class DispatcherThread : public Thread {
~DispatcherThread() {shutdown();}
protected:
void run();
void run() override;
void addStatus(arangodb::velocypack::Builder* b);
void addStatus(arangodb::velocypack::Builder* b) override;
public:
//////////////////////////////////////////////////////////////////////////////

View File

@ -80,17 +80,17 @@ class ApplicationScheduler : public ApplicationFeature {
void disableControlCHandler();
public:
void setupOptions(std::map<std::string, basics::ProgramOptionsDescription>&);
void setupOptions(std::map<std::string, basics::ProgramOptionsDescription>&) override;
bool afterOptionParsing(basics::ProgramOptions&);
bool afterOptionParsing(basics::ProgramOptions&) override;
bool prepare();
bool prepare() override ;
bool start();
bool start() override;
bool open();
bool open() override;
void stop();
void stop() override;
private:
//////////////////////////////////////////////////////////////////////////////

View File

@ -69,7 +69,7 @@ struct CustomTypeHandlerImpl : public VPackCustomTypeHandler {
: resolver(resolver) {}
void toJson(VPackSlice const& value, VPackDumper* dumper,
VPackSlice const& base) {
VPackSlice const& base) override {
if (value.head() == 0xf0) {
// _id
if (!base.isObject()) {
@ -110,7 +110,7 @@ struct CustomTypeHandlerImpl : public VPackCustomTypeHandler {
throw "unknown type!";
}
VPackValueLength byteSize(VPackSlice const& value) {
VPackValueLength byteSize(VPackSlice const& value) override {
if (value.head() == 0xf0) {
// _id
return 1 + 8; // 0xf0 + 8 bytes for collection id

View File

@ -81,7 +81,7 @@ class BenchmarkThread : public arangodb::Thread {
/// @brief the thread program
//////////////////////////////////////////////////////////////////////////////
void run() {
void run() override {
try {
_httpClient = _client->createHttpClient();
} catch (...) {

View File

@ -73,31 +73,31 @@ class EndpointIp : public Endpoint {
/// @brief connect the endpoint
//////////////////////////////////////////////////////////////////////////////
TRI_socket_t connect(double, double);
TRI_socket_t connect(double, double) override;
//////////////////////////////////////////////////////////////////////////////
/// @brief disconnect the endpoint
//////////////////////////////////////////////////////////////////////////////
virtual void disconnect();
virtual void disconnect() override;
//////////////////////////////////////////////////////////////////////////////
/// @brief init an incoming connection
//////////////////////////////////////////////////////////////////////////////
virtual bool initIncoming(TRI_socket_t);
virtual bool initIncoming(TRI_socket_t) override;
//////////////////////////////////////////////////////////////////////////////
/// @brief get port
//////////////////////////////////////////////////////////////////////////////
int getPort() const { return _port; }
int getPort() const override { return _port; }
//////////////////////////////////////////////////////////////////////////////
/// @brief get host
//////////////////////////////////////////////////////////////////////////////
std::string getHost() const { return _host; }
std::string getHost() const override { return _host; }
private:
//////////////////////////////////////////////////////////////////////////////

View File

@ -51,13 +51,13 @@ class EndpointIpV4 final : public EndpointIp {
/// @brief get endpoint domain
//////////////////////////////////////////////////////////////////////////////
int getDomain() const { return AF_INET; }
int getDomain() const override { return AF_INET; }
//////////////////////////////////////////////////////////////////////////////
/// @brief get host string for HTTP requests
//////////////////////////////////////////////////////////////////////////////
std::string getHostString() const {
std::string getHostString() const override{
return getHost() + ':' + arangodb::basics::StringUtils::itoa(getPort());
}
};

View File

@ -51,13 +51,13 @@ class EndpointIpV6 final : public EndpointIp {
/// @brief get endpoint domain
//////////////////////////////////////////////////////////////////////////////
int getDomain() const { return AF_INET6; }
int getDomain() const override { return AF_INET6; }
//////////////////////////////////////////////////////////////////////////////
/// @brief get host string for HTTP requests
//////////////////////////////////////////////////////////////////////////////
std::string getHostString() const {
std::string getHostString() const override {
return '[' + getHost() + "]:" +
arangodb::basics::StringUtils::itoa(getPort());
}