diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-05-02 14:41:52 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2017-05-02 14:41:52 +0200 |
commit | 21b07bb7cd3ee02df95d53d4492f32dabd6c1cfb (patch) | |
tree | dfaec5477b21737127512422b7759235e895a96a /fastos | |
parent | 0f646f10b377b90fc37e9911f9fe383d112ff157 (diff) |
Fix warnings hidden earlier due to including application headers as system includes
Diffstat (limited to 'fastos')
-rw-r--r-- | fastos/src/vespa/fastos/file.cpp | 3 | ||||
-rw-r--r-- | fastos/src/vespa/fastos/file.h | 1 | ||||
-rw-r--r-- | fastos/src/vespa/fastos/unix_ipc.h | 23 |
3 files changed, 12 insertions, 15 deletions
diff --git a/fastos/src/vespa/fastos/file.cpp b/fastos/src/vespa/fastos/file.cpp index e1592ffb409..2e771250861 100644 --- a/fastos/src/vespa/fastos/file.cpp +++ b/fastos/src/vespa/fastos/file.cpp @@ -8,7 +8,6 @@ #include <vespa/fastos/file.h> #include <sstream> -#include <stdexcept> DirectIOException::DirectIOException(const char * fileName, const void * buffer, size_t length, int64_t offset) : @@ -25,6 +24,8 @@ DirectIOException::DirectIOException(const char * fileName, const void * buffer, _what = os.str(); } +DirectIOException::~DirectIOException() {} + FastOS_FileInterface::FailedHandler FastOS_FileInterface::_failedHandler = NULL; int FastOS_FileInterface::_defaultFAdviseOptions = POSIX_FADV_NORMAL; diff --git a/fastos/src/vespa/fastos/file.h b/fastos/src/vespa/fastos/file.h index 9d879db4b3e..f0ad44c1c88 100644 --- a/fastos/src/vespa/fastos/file.h +++ b/fastos/src/vespa/fastos/file.h @@ -66,6 +66,7 @@ class DirectIOException : public std::exception { public: DirectIOException(const char * fileName, const void * buffer, size_t length, int64_t offset); + ~DirectIOException(); const char* what() const noexcept override { return _what.c_str(); } const void * getBuffer() const { return _buffer; } size_t getLength() const { return _length; } diff --git a/fastos/src/vespa/fastos/unix_ipc.h b/fastos/src/vespa/fastos/unix_ipc.h index 678b24002e1..f8b240c5155 100644 --- a/fastos/src/vespa/fastos/unix_ipc.h +++ b/fastos/src/vespa/fastos/unix_ipc.h @@ -1,7 +1,7 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/fastos/app.h> -#include <vespa/fastos/process.h> -#include <vespa/fastos/thread.h> +#include "app.h" +#include "process.h" +#include "thread.h" #include <poll.h> class FastOS_RingBuffer; @@ -24,26 +24,21 @@ protected: bool DoWrite (FastOS_UNIX_Process::DescriptorHandle &desc); bool DoRead (FastOS_UNIX_Process::DescriptorHandle &desc); bool SetBlocking (int fileDescriptor, bool doBlock); - void BuildPollCheck (bool isRead, int filedes, - FastOS_RingBuffer *buffer, bool *check); - void BuildPollArray(pollfd **fds, unsigned int *nfds, - unsigned int *allocnfds); + void BuildPollCheck (bool isRead, int filedes, FastOS_RingBuffer *buffer, bool *check); + void BuildPollArray(pollfd **fds, unsigned int *nfds, unsigned int *allocnfds); bool SavePollArray(pollfd *fds, unsigned int nfds); void PerformAsyncIO (void); void PerformAsyncIPCIO (void); void BuildPollChecks(void); void DeliverMessages (FastOS_RingBuffer *buffer); - void PipeData (FastOS_UNIX_Process *process, - FastOS_UNIX_Process::DescriptorType type); + void PipeData (FastOS_UNIX_Process *process, FastOS_UNIX_Process::DescriptorType type); void RemoveClosingProcesses(void); public: - FastOS_UNIX_IPCHelper (FastOS_ApplicationInterface *app, - int appDescriptor); + FastOS_UNIX_IPCHelper (FastOS_ApplicationInterface *app, int appDescriptor); ~FastOS_UNIX_IPCHelper (); - void Run (FastOS_ThreadInterface *thisThread, void *arg); - bool SendMessage (FastOS_UNIX_Process *xproc, const void *buffer, - int length); + void Run (FastOS_ThreadInterface *thisThread, void *arg) override; + bool SendMessage (FastOS_UNIX_Process *xproc, const void *buffer, int length); void NotifyProcessListChange (); void AddProcess (FastOS_UNIX_Process *xproc); void RemoveProcess (FastOS_UNIX_Process *xproc); |