Merge pull request #12495 from kjbracey-arm/override_serial

C++11-ify virtualisation in FileHandle + Serials

Author: 0xc0170

drivers/BufferedSerial.h

@@ -80,14 +80,14 @@ class BufferedSerial:
         int baud = MBED_CONF_PLATFORM_DEFAULT_SERIAL_BAUD_RATE
     );
 
-    virtual ~BufferedSerial();
+    ~BufferedSerial() override;
 
     /** Equivalent to POSIX poll(). Derived from FileHandle.
      *  Provides a mechanism to multiplex input/output over a set of file
      *  handles.
      *  The events that can be reported are POLLIN, POLLOUT, POLLHUP.
      */
-    virtual short poll(short events) const;
+    short poll(short events) const final;
 
     /* Resolve ambiguities versus our private SerialBase
      * (for writable, spelling differs, but just in case)
@@ -107,7 +107,7 @@ class BufferedSerial:
      *  @param length   The number of bytes to write
      *  @return         The number of bytes written, negative error on failure
      */
-    virtual ssize_t write(const void *buffer, size_t length);
+    ssize_t write(const void *buffer, size_t length) override;
 
     /** Read the contents of a file into a buffer
      *
@@ -123,21 +123,21 @@ class BufferedSerial:
      *  @return         The number of bytes read, 0 at end of file, negative
      *                  error on failure
      */
-    virtual ssize_t read(void *buffer, size_t length);
+    ssize_t read(void *buffer, size_t length) override;
 
     /** Close a file
      *
      *  @return         0 on success, negative error code on failure
      */
-    virtual int close();
+    int close() override;
 
     /** Check if the file in an interactive terminal device
      *
      *  @return         True if the file is a terminal
      *  @return         False if the file is not a terminal
      *  @return         Negative error code on failure
      */
-    virtual int isatty();
+    int isatty() override;
 
     /** Move the file position to a given offset from from a given location
      *
@@ -152,20 +152,20 @@ class BufferedSerial:
      *  @return         The new offset of the file, negative error code on
      *                  failure
      */
-    virtual off_t seek(off_t offset, int whence);
+    off_t seek(off_t offset, int whence) override;
 
     /** Flush any buffers associated with the file
      *
      *  @return         0 on success, negative error code on failure
      */
-    virtual int sync();
+    int sync() override;
 
     /** Set blocking or non-blocking mode
      *  The default is blocking.
      *
      *  @param blocking true for blocking mode, false for non-blocking mode.
      */
-    virtual int set_blocking(bool blocking)
+    int set_blocking(bool blocking) override
     {
         _blocking = blocking;
         return 0;
@@ -175,7 +175,7 @@ class BufferedSerial:
      *
      *  @return true for blocking mode, false for non-blocking mode.
      */
-    virtual bool is_blocking() const
+    bool is_blocking() const override
     {
         return _blocking;
     }
@@ -193,7 +193,7 @@ class BufferedSerial:
      *  @return             0 on success
      *  @return             Negative error code on failure
      */
-    virtual int enable_input(bool enabled);
+    int enable_input(bool enabled) override;
 
     /** Enable or disable output
      *
@@ -208,7 +208,7 @@ class BufferedSerial:
      *  @return             0 on success
      *  @return             Negative error code on failure
      */
-    virtual int enable_output(bool enabled);
+    int enable_output(bool enabled) override;
 
     /** Register a callback on state change of the file.
      *
@@ -227,7 +227,7 @@ class BufferedSerial:
      *
      *  @param func     Function to call on state change
      */
-    virtual void sigio(Callback<void()> func);
+    void sigio(Callback<void()> func) override;
 
     /** Setup interrupt handler for DCD line
      *
@@ -288,11 +288,11 @@ class BufferedSerial:
 
     /** Acquire mutex
      */
-    virtual void api_lock(void);
+    void api_lock(void);
 
     /** Release mutex
      */
-    virtual void api_unlock(void);
+    void api_unlock(void);
 
     /** Unbuffered write - invoked when write called from critical section
      *  @param buf_ptr   The buffer to write from

drivers/SerialWireOutput.h

@@ -35,35 +35,35 @@ class SerialWireOutput : public FileHandle {
 
 public:
 
-    SerialWireOutput(void);
+    SerialWireOutput();
 
-    virtual ssize_t write(const void *buffer, size_t size);
+    ssize_t write(const void *buffer, size_t size) override;
 
-    virtual ssize_t read(void *buffer, size_t size)
+    ssize_t read(void *buffer, size_t size) override
     {
         /* Reading is not supported by this file handle */
         return -EBADF;
     }
 
-    virtual off_t seek(off_t offset, int whence = SEEK_SET)
+    off_t seek(off_t offset, int whence = SEEK_SET) override
     {
         /* Seeking is not support by this file handler */
         return -ESPIPE;
     }
 
-    virtual off_t size()
+    off_t size() override
     {
         /* Size is not defined for this file handle */
         return -EINVAL;
     }
 
-    virtual int isatty()
+    int isatty() override
     {
         /* File handle is used for terminal output */
         return true;
     }
 
-    virtual int close()
+    int close() override
     {
         return 0;
     }

drivers/UnbufferedSerial.h

@@ -85,7 +85,7 @@ class UnbufferedSerial:
      *  @param size     The number of bytes to write
      *  @return         The number of bytes written
      */
-    virtual ssize_t write(const void *buffer, size_t size);
+    ssize_t write(const void *buffer, size_t size) override;
 
     /** Read the contents of a file into a buffer
      *
@@ -95,7 +95,7 @@ class UnbufferedSerial:
      *  @param size     The number of bytes to read
      *  @return         The number of bytes read
      */
-    virtual ssize_t read(void *buffer, size_t size);
+    ssize_t read(void *buffer, size_t size) override;
 
     /** Move the file position to a given offset from from a given location
      *
@@ -109,7 +109,7 @@ class UnbufferedSerial:
      *      SEEK_END to start from end of file
      *  @return         The new offset of the file, negative error code on failure
      */
-    virtual off_t seek(off_t offset, int whence = SEEK_SET)
+    off_t seek(off_t offset, int whence = SEEK_SET) override
     {
         return -ESPIPE;
     }
@@ -118,7 +118,7 @@ class UnbufferedSerial:
      *
      *  @return         Size of the file in bytes
      */
-    virtual off_t size()
+    off_t size() override
     {
         return -EINVAL;
     }
@@ -129,7 +129,7 @@ class UnbufferedSerial:
      *  @return         False if the file is not a terminal
      *  @return         Negative error code on failure
      */
-    virtual int isatty()
+    int isatty() override
     {
         return true;
     }
@@ -138,7 +138,7 @@ class UnbufferedSerial:
      *
      *  @return         0 on success, negative error code on failure
      */
-    virtual int close()
+    int close() override
     {
         return 0;
     }
@@ -153,7 +153,7 @@ class UnbufferedSerial:
      *
      * @returns             bitmask of poll events that have occurred.
      */
-    virtual short poll(short events) const;
+    short poll(short events) const override;
 
     using SerialBase::readable;
     using SerialBase::writeable;

drivers/source/SerialWireOutput.cpp

@@ -23,7 +23,7 @@
 
 namespace mbed {
 
-SerialWireOutput::SerialWireOutput(void)
+SerialWireOutput::SerialWireOutput()
 {
     /* Initialize ITM using internal init function. */
     mbed_itm_init();

platform/FileHandle.h

@@ -45,7 +45,7 @@ namespace mbed {
  */
 class FileHandle : private NonCopyable<FileHandle> {
 public:
-    virtual ~FileHandle() {}
+    virtual ~FileHandle() = default;
 
     /** Read the contents of a file into a buffer
      *