From 3d58fa92a87578b0944aec2c47ca23ebbf5720e3 Mon Sep 17 00:00:00 2001 From: Tom Cherry Date: Mon, 17 Jul 2017 09:01:37 -0700 Subject: remove extraneous `using namespace android` and deprecate utils/Log.h This namespace is not used by this file and its declaration is removed in a separate CL from utils/Log.h, which is the only place it is defined, so we must remove this extraneous line. Also, since that separate CL is deprecating utils/Log.h in favor of log/log.h, we make the switch to the new header. Test: Build Change-Id: I06ace87ae89d5bacf414f851674149c4741f1d87 --- bcmdhd/wifi_hal/wifi_logger.cpp | 4 +--- bcmdhd/wifi_hal/wifi_offload.cpp | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'bcmdhd') diff --git a/bcmdhd/wifi_hal/wifi_logger.cpp b/bcmdhd/wifi_hal/wifi_logger.cpp index e5b40c4..6924017 100644 --- a/bcmdhd/wifi_hal/wifi_logger.cpp +++ b/bcmdhd/wifi_hal/wifi_logger.cpp @@ -21,14 +21,12 @@ #define LOG_TAG "WifiHAL" -#include +#include #include "wifi_hal.h" #include "common.h" #include "cpp_bindings.h" -using namespace android; - typedef enum { LOGGER_START_LOGGING = ANDROID_NL80211_SUBCMD_DEBUG_RANGE_START, LOGGER_TRIGGER_MEM_DUMP, diff --git a/bcmdhd/wifi_hal/wifi_offload.cpp b/bcmdhd/wifi_hal/wifi_offload.cpp index e1013f5..52891c7 100644 --- a/bcmdhd/wifi_hal/wifi_offload.cpp +++ b/bcmdhd/wifi_hal/wifi_offload.cpp @@ -22,14 +22,12 @@ #define LOG_TAG "WifiHAL" -#include +#include #include "wifi_hal.h" #include "common.h" #include "cpp_bindings.h" -using namespace android; - typedef enum { WIFI_OFFLOAD_START_MKEEP_ALIVE = ANDROID_NL80211_SUBCMD_WIFI_OFFLOAD_RANGE_START, WIFI_OFFLOAD_STOP_MKEEP_ALIVE, -- cgit v1.2.3