From a9c30378621a507edeefc63eea0be6c1416cdbe1 Mon Sep 17 00:00:00 2001 From: Terry Mancey Date: Tue, 26 Feb 2019 22:43:05 +0000 Subject: [PATCH] Revert "Merge pull request #75 from brave-intl/issues/52" This reverts commit fc7de34977c3bb878a8f042cc5e9361858757b43, reversing changes made to 211e7672071c99d85f402908f8afe1d046a31b0d. --- .../bat/confirmations/confirmations_client.h | 3 --- vendor/bat-native-confirmations/src/logging.h | 20 +++++++++++++++---- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/vendor/bat-native-confirmations/include/bat/confirmations/confirmations_client.h b/vendor/bat-native-confirmations/include/bat/confirmations/confirmations_client.h index 59c8527e46cb..9f5306e35d55 100644 --- a/vendor/bat-native-confirmations/include/bat/confirmations/confirmations_client.h +++ b/vendor/bat-native-confirmations/include/bat/confirmations/confirmations_client.h @@ -17,9 +17,6 @@ using URLRequestMethod = ::ledger::URL_METHOD; using Result = ::ledger::Result; const auto SUCCESS = ::ledger::Result::LEDGER_OK; const auto FAILED = ::ledger::Result::LEDGER_ERROR; -const auto INFO = ::ledger::LogLevel::LOG_INFO; -const auto WARNING = ::ledger::LogLevel::LOG_WARNING; -const auto ERROR = ::ledger::LogLevel::LOG_ERROR; using OnSaveCallback = ::ledger::OnSaveCallback; using OnLoadCallback = ::ledger::OnLoadCallback; diff --git a/vendor/bat-native-confirmations/src/logging.h b/vendor/bat-native-confirmations/src/logging.h index 53ce10c55ea6..8baeb0c93d68 100644 --- a/vendor/bat-native-confirmations/src/logging.h +++ b/vendor/bat-native-confirmations/src/logging.h @@ -8,10 +8,22 @@ #include "bat/confirmations/confirmations_client.h" -#define BLOG(severity) \ - confirmations_client_->Log(__FILE__, __LINE__, severity)->stream() +#define CONFIRMATIONS_LOG_INFO \ + confirmations_client_->Log( \ + __FILE__, __LINE__, ::ledger::LogLevel::LOG_INFO) -#define BVLOG(severity) \ - confirmations_client_->VerboseLog(__FILE__, __LINE__, severity)->stream() +#define CONFIRMATIONS_LOG_WARNING \ + confirmations_client_->Log( \ + __FILE__, __LINE__, ::ledger::LogLevel::LOG_WARNING) + +#define CONFIRMATIONS_LOG_ERROR \ + confirmations_client_->Log( \ + __FILE__, __LINE__, ::ledger::LogLevel::LOG_ERROR) + +#define BLOG(severity) CONFIRMATIONS_LOG_ ## severity->stream() + +#if defined(ERROR) +#define LOG_0 CONFIRMATIONS_LOG_ERROR +#endif #endif // BAT_CONFIRMATIONS_LOGGING_H_