ARMmbed · theotherjimmy · Jun 26, 2017 · Jun 20, 2017 · Jun 20, 2017 · Jun 20, 2017
diff --git a/drivers/BusIn.h b/drivers/BusIn.h
@@ -19,6 +19,7 @@
 #include "platform/platform.h"
 #include "drivers/DigitalIn.h"
 #include "platform/PlatformMutex.h"
+#include "platform/NonCopyable.h"
 
 namespace mbed {
 /** \addtogroup drivers */
@@ -28,7 +29,7 @@ namespace mbed {
  * @note Synchronization level: Thread safe
  * @ingroup drivers
  */
-class BusIn {
+class BusIn : private NonCopyable<BusIn> {
 
 public:
     /* Group: Configuration Methods */
@@ -115,12 +116,9 @@ class BusIn {
 
     PlatformMutex _mutex;
 
-    /* disallow copy constructor and assignment operators */
 private:
     virtual void lock();
     virtual void unlock();
-    BusIn(const BusIn&);
-    BusIn & operator = (const BusIn&);
 };
 
 } // namespace mbed

diff --git a/drivers/BusInOut.h b/drivers/BusInOut.h
@@ -18,6 +18,7 @@
 
 #include "drivers/DigitalInOut.h"
 #include "platform/PlatformMutex.h"
+#include "platform/NonCopyable.h"
 
 namespace mbed {
 /** \addtogroup drivers */
@@ -27,7 +28,7 @@ namespace mbed {
  * @note Synchronization level: Thread safe
  * @ingroup drivers
  */
-class BusInOut {
+class BusInOut : private NonCopyable<BusInOut> {
 
 public:
 
@@ -135,11 +136,6 @@ class BusInOut {
     int _nc_mask;
 
     PlatformMutex _mutex;
-
-    /* disallow copy constructor and assignment operators */
-private:
-    BusInOut(const BusInOut&);
-    BusInOut & operator = (const BusInOut&);
 };
 
 } // namespace mbed

diff --git a/drivers/BusOut.h b/drivers/BusOut.h
@@ -18,14 +18,15 @@
 
 #include "drivers/DigitalOut.h"
 #include "platform/PlatformMutex.h"
+#include "platform/NonCopyable.h"
 
 namespace mbed {
 /** \addtogroup drivers */
 
 /** A digital output bus, used for setting the state of a collection of pins
  * @ingroup drivers
  */
-class BusOut {
+class BusOut : private NonCopyable<BusOut> {
 
 public:
 
@@ -119,11 +120,6 @@ class BusOut {
     int _nc_mask;
 
     PlatformMutex _mutex;
-
-   /* disallow copy constructor and assignment operators */
-private:
-    BusOut(const BusOut&);
-    BusOut & operator = (const BusOut&);
 };
 
 } // namespace mbed

diff --git a/drivers/CAN.h b/drivers/CAN.h
@@ -23,6 +23,7 @@
 #include "hal/can_api.h"
 #include "platform/Callback.h"
 #include "platform/PlatformMutex.h"
+#include "platform/NonCopyable.h"
 
 namespace mbed {
 /** \addtogroup drivers */
@@ -78,7 +79,7 @@ class CANMessage : public CAN_Message {
 /** A can bus client, used for communicating with can devices
  * @ingroup drivers
  */
-class CAN {
+class CAN : private NonCopyable<CAN> {
 
 public:
     /** Creates an CAN interface connected to specific pins.

diff --git a/drivers/Ethernet.h b/drivers/Ethernet.h
@@ -17,6 +17,7 @@
 #define MBED_ETHERNET_H
 
 #include "platform/platform.h"
+#include "platform/NonCopyable.h"
 
 #if defined (DEVICE_ETHERNET) || defined(DOXYGEN_ONLY)
 
@@ -54,7 +55,7 @@ namespace mbed {
  * @endcode
  * @ingroup drivers
  */
-class Ethernet {
+class Ethernet : private NonCopyable<Ethernet> {
 
 public:
 

diff --git a/drivers/FlashIAP.h b/drivers/FlashIAP.h
@@ -27,6 +27,7 @@
 #include "flash_api.h"
 #include "platform/SingletonPtr.h"
 #include "platform/PlatformMutex.h"
+#include "platform/NonCopyable.h"
 
 namespace mbed {
 
@@ -37,7 +38,7 @@ namespace mbed {
  * @note Synchronization level: Thread safe
  * @ingroup drivers
  */
-class FlashIAP {
+class FlashIAP : private NonCopyable<FlashIAP> {
 public:
     FlashIAP();
     ~FlashIAP();

diff --git a/drivers/I2C.h b/drivers/I2C.h
@@ -23,6 +23,7 @@
 #include "hal/i2c_api.h"
 #include "platform/SingletonPtr.h"
 #include "platform/PlatformMutex.h"
+#include "platform/NonCopyable.h"
 
 #if DEVICE_I2C_ASYNCH
 #include "platform/CThunk.h"
@@ -53,7 +54,7 @@ namespace mbed {
  * @endcode
  * @ingroup drivers
  */
-class I2C {
+class I2C : private NonCopyable<I2C> {
 
 public:
     enum RxStatus {

diff --git a/drivers/InterruptIn.h b/drivers/InterruptIn.h
@@ -25,6 +25,7 @@
 #include "platform/Callback.h"
 #include "platform/mbed_critical.h"
 #include "platform/mbed_toolchain.h"
+#include "platform/NonCopyable.h"
 
 namespace mbed {
 /** \addtogroup drivers */
@@ -56,7 +57,7 @@ namespace mbed {
  * @endcode
  * @ingroup drivers
  */
-class InterruptIn {
+class InterruptIn : private NonCopyable<InterruptIn> {
 
 public:
 

diff --git a/drivers/InterruptManager.h b/drivers/InterruptManager.h
@@ -19,6 +19,7 @@
 #include "cmsis.h"
 #include "platform/CallChain.h"
 #include "platform/PlatformMutex.h"
+#include "platform/NonCopyable.h"
 #include <string.h>
 
 namespace mbed {
@@ -53,7 +54,7 @@ namespace mbed {
  * @endcode
  * @ingroup drivers
  */
-class InterruptManager {
+class InterruptManager : private NonCopyable<InterruptManager> {
 public:
     /** Get the instance of InterruptManager Class
      *
@@ -138,12 +139,6 @@ class InterruptManager {
     void lock();
     void unlock();
 
-    // We declare the copy contructor and the assignment operator, but we don't
-    // implement them. This way, if someone tries to copy/assign our instance,
-    // he will get an error at compile time.
-    InterruptManager(const InterruptManager&);
-    InterruptManager& operator =(const InterruptManager&);
-
     template<typename T>
     pFunctionPointer_t add_common(T *tptr, void (T::*mptr)(void), IRQn_Type irq, bool front=false) {
         _mutex.lock();

diff --git a/drivers/LowPowerTicker.h b/drivers/LowPowerTicker.h
@@ -18,6 +18,7 @@
 
 #include "platform/platform.h"
 #include "drivers/Ticker.h"
+#include "platform/NonCopyable.h"
 
 #if defined (DEVICE_LOWPOWERTIMER) || defined(DOXYGEN_ONLY)
 
@@ -31,7 +32,7 @@ namespace mbed {
  * @note Synchronization level: Interrupt safe
  * @ingroup drivers
  */
-class LowPowerTicker : public Ticker {
+class LowPowerTicker : public Ticker, private NonCopyable<LowPowerTicker> {
 
 public:
     LowPowerTicker() : Ticker(get_lp_ticker_data()) {

diff --git a/drivers/LowPowerTimeout.h b/drivers/LowPowerTimeout.h
@@ -22,6 +22,7 @@
 
 #include "hal/lp_ticker_api.h"
 #include "drivers/LowPowerTicker.h"
+#include "platform/NonCopyable.h"
 
 namespace mbed {
 /** \addtogroup drivers */
@@ -31,7 +32,7 @@ namespace mbed {
  * @note Synchronization level: Interrupt safe
  * @ingroup drivers
  */
-class LowPowerTimeout : public LowPowerTicker {
+class LowPowerTimeout : public LowPowerTicker, private NonCopyable<LowPowerTimeout> {
 
 private:
     virtual void handler(void) {

diff --git a/drivers/LowPowerTimer.h b/drivers/LowPowerTimer.h
@@ -18,6 +18,7 @@
 
 #include "platform/platform.h"
 #include "drivers/Timer.h"
+#include "platform/NonCopyable.h"
 
 #if defined (DEVICE_LOWPOWERTIMER) || defined(DOXYGEN_ONLY)
 
@@ -31,7 +32,7 @@ namespace mbed {
  * @note Synchronization level: Interrupt safe
  * @ingroup drivers
  */
-class LowPowerTimer : public Timer {
+class LowPowerTimer : public Timer, private NonCopyable<LowPowerTimer> {
 
 public:
     LowPowerTimer() : Timer(get_lp_ticker_data()) {

diff --git a/drivers/RawSerial.h b/drivers/RawSerial.h
@@ -22,6 +22,7 @@
 
 #include "drivers/SerialBase.h"
 #include "hal/serial_api.h"
+#include "platform/NonCopyable.h"
 
 namespace mbed {
 /** \addtogroup drivers */
@@ -49,7 +50,7 @@ namespace mbed {
  * @endcode
  * @ingroup drivers
  */
-class RawSerial: public SerialBase {
+class RawSerial: public SerialBase, private NonCopyable<RawSerial> {
 
 public:
     /** Create a RawSerial port, connected to the specified transmit and receive pins, with the specified baud.

diff --git a/drivers/SPI.h b/drivers/SPI.h
@@ -23,6 +23,7 @@
 #include "platform/PlatformMutex.h"
 #include "hal/spi_api.h"
 #include "platform/SingletonPtr.h"
+#include "platform/NonCopyable.h"
 
 #if DEVICE_SPI_ASYNCH
 #include "platform/CThunk.h"
@@ -72,7 +73,7 @@ namespace mbed {
  * @endcode
  * @ingroup drivers
  */
-class SPI {
+class SPI : private NonCopyable<SPI> {
 
 public:
 

diff --git a/drivers/SPISlave.h b/drivers/SPISlave.h
@@ -17,6 +17,7 @@
 #define MBED_SPISLAVE_H
 
 #include "platform/platform.h"
+#include "platform/NonCopyable.h"
 
 #if defined (DEVICE_SPISLAVE) || defined(DOXYGEN_ONLY)
 
@@ -52,7 +53,7 @@ namespace mbed {
  * @endcode
  * @ingroup drivers
  */
-class SPISlave {
+class SPISlave : private NonCopyable<SPISlave> {
 
 public:
 

diff --git a/drivers/Serial.h b/drivers/Serial.h
@@ -24,6 +24,7 @@
 #include "SerialBase.h"
 #include "PlatformMutex.h"
 #include "serial_api.h"
+#include "platform/NonCopyable.h"
 
 namespace mbed {
 /** \addtogroup drivers */
@@ -49,7 +50,7 @@ namespace mbed {
  * @endcode
  * @ingroup drivers
  */
-class Serial : public SerialBase, public Stream {
+class Serial : public SerialBase, public Stream, private NonCopyable<Serial> {
 
 public:
 #if DEVICE_SERIAL_ASYNCH

diff --git a/drivers/SerialBase.h b/drivers/SerialBase.h
@@ -23,6 +23,7 @@
 #include "Callback.h"
 #include "serial_api.h"
 #include "mbed_toolchain.h"
+#include "platform/NonCopyable.h"
 
 #if DEVICE_SERIAL_ASYNCH
 #include "CThunk.h"
@@ -38,7 +39,7 @@ namespace mbed {
  * @note Synchronization level: Set by subclass
  * @ingroup drivers
  */
-class SerialBase {
+class SerialBase : private NonCopyable<SerialBase> {
 
 public:
     /** Set the baud rate of the serial port

diff --git a/drivers/Ticker.h b/drivers/Ticker.h
@@ -19,6 +19,7 @@
 #include "drivers/TimerEvent.h"
 #include "platform/Callback.h"
 #include "platform/mbed_toolchain.h"
+#include "platform/NonCopyable.h"
 
 namespace mbed {
 /** \addtogroup drivers */
@@ -59,7 +60,7 @@ namespace mbed {
  * @endcode
  * @ingroup drivers
  */
-class Ticker : public TimerEvent {
+class Ticker : public TimerEvent, private NonCopyable<Ticker> {
 
 public:
     Ticker() : TimerEvent() {

diff --git a/drivers/Timeout.h b/drivers/Timeout.h
@@ -17,6 +17,7 @@
 #define MBED_TIMEOUT_H
 
 #include "drivers/Ticker.h"
+#include "platform/NonCopyable.h"
 
 namespace mbed {
 /** \addtogroup drivers */
@@ -52,7 +53,7 @@ namespace mbed {
  * @endcode
  * @ingroup drivers
  */
-class Timeout : public Ticker {
+class Timeout : public Ticker, private NonCopyable<Timeout> {
 
 protected:
     virtual void handler();

diff --git a/drivers/Timer.h b/drivers/Timer.h
@@ -18,6 +18,7 @@
 
 #include "platform/platform.h"
 #include "hal/ticker_api.h"
+#include "platform/NonCopyable.h"
 
 namespace mbed {
 /** \addtogroup drivers */
@@ -46,7 +47,7 @@ namespace mbed {
  * @endcode
  * @ingroup drivers
  */
-class Timer {
+class Timer : private NonCopyable<Timer> {
 
 public:
     Timer();