From c5464757ad147f42089e6728eabb3906181be5fe Mon Sep 17 00:00:00 2001 From: Koushik Dutta Date: Wed, 14 Aug 2013 10:14:59 -0700 Subject: Switch UsbLogLevel back to an int. AOSP does not support C++11 Change-Id: Iaf2e09cc05f8f867fa776b62313af6774ce47a56 --- heimdall/source/FlashAction.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'heimdall/source/FlashAction.cpp') diff --git a/heimdall/source/FlashAction.cpp b/heimdall/source/FlashAction.cpp index 6f2d49b..0bea8a6 100644 --- a/heimdall/source/FlashAction.cpp +++ b/heimdall/source/FlashAction.cpp @@ -428,7 +428,7 @@ int FlashAction::Execute(int argc, char **argv) const StringArgument *usbLogLevelArgument = static_cast(arguments.GetArgument("usb-log-level")); - BridgeManager::UsbLogLevel usbLogLevel = BridgeManager::UsbLogLevel::Default; + BridgeManager::UsbLogLevel usbLogLevel = BridgeManager::Default; if (usbLogLevelArgument) { @@ -436,23 +436,23 @@ int FlashAction::Execute(int argc, char **argv) if (usbLogLevelString.compare("none") == 0 || usbLogLevelString.compare("NONE") == 0) { - usbLogLevel = BridgeManager::UsbLogLevel::None; + usbLogLevel = BridgeManager::None; } else if (usbLogLevelString.compare("error") == 0 || usbLogLevelString.compare("ERROR") == 0) { - usbLogLevel = BridgeManager::UsbLogLevel::Error; + usbLogLevel = BridgeManager::Error; } else if (usbLogLevelString.compare("warning") == 0 || usbLogLevelString.compare("WARNING") == 0) { - usbLogLevel = BridgeManager::UsbLogLevel::Warning; + usbLogLevel = BridgeManager::Warning; } else if (usbLogLevelString.compare("info") == 0 || usbLogLevelString.compare("INFO") == 0) { - usbLogLevel = BridgeManager::UsbLogLevel::Info; + usbLogLevel = BridgeManager::Info; } else if (usbLogLevelString.compare("debug") == 0 || usbLogLevelString.compare("DEBUG") == 0) { - usbLogLevel = BridgeManager::UsbLogLevel::Debug; + usbLogLevel = BridgeManager::Debug; } else { -- cgit v1.1