From 662c4a64af58296aa18a28ba7186d2b81386d85b Mon Sep 17 00:00:00 2001
From: Christopher Haster <chaster@utexas.edu>
Date: Tue, 21 Aug 2018 12:33:32 -0500
Subject: [PATCH] Revert of namespace mbed

Currently breaking backwards compatibility, including CI dependencies
---
 SPIFBlockDevice.cpp | 5 +----
 SPIFBlockDevice.h   | 8 ++------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/SPIFBlockDevice.cpp b/SPIFBlockDevice.cpp
index bc94d466df..2f753813e8 100644
--- a/SPIFBlockDevice.cpp
+++ b/SPIFBlockDevice.cpp
@@ -22,6 +22,7 @@
 
 #include "mbed_trace.h"
 #define TRACE_GROUP "SPIF"
+using namespace mbed;
 
 /* Default SPIF Parameters */
 /****************************/
@@ -71,8 +72,6 @@
 
 #define IS_MEM_READY_MAX_RETRIES 10000
 
-namespace mbed {
-
 enum spif_default_instructions {
     SPIF_NOP = 0x00, // No operation
     SPIF_PP = 0x02, // Page Program data
@@ -1031,6 +1030,4 @@ static unsigned int local_math_power(int base, int exp)
     return result;
 }
 
-} //namespace mbed
-
 
diff --git a/SPIFBlockDevice.h b/SPIFBlockDevice.h
index 5290cee494..4c46da81ea 100644
--- a/SPIFBlockDevice.h
+++ b/SPIFBlockDevice.h
@@ -20,8 +20,6 @@
 #include "DigitalOut.h"
 #include "BlockDevice.h"
 
-namespace mbed {
-
 /** Enum spif standard error codes
  *
  *  @enum qpif_bd_error
@@ -256,9 +254,9 @@ private:
 
 private:
     // Master side hardware
-    SPI _spi;
+    mbed::SPI _spi;
     // Enable CS control (low/high) for SPI driver operatios
-    DigitalOut _cs;
+    mbed::DigitalOut _cs;
 
     // Mutex is used to protect Flash device for some SPI Driver commands that must be done sequentially with no other commands in between
     // e.g. (1)Set Write Enable, (2)Program, (3)Wait Memory Ready
@@ -294,6 +292,4 @@ private:
     bool _is_initialized;
 };
 
-} //namespace mbed
-
 #endif  /* MBED_SPIF_BLOCK_DEVICE_H */