From 577996e0fb32d3b54175656a17c6ddecf06caa43 Mon Sep 17 00:00:00 2001 From: Terry Mancey Date: Tue, 12 Mar 2019 02:30:27 +0000 Subject: [PATCH] =?UTF-8?q?Fixed=20Windows=20build=20error=20caused=20by?= =?UTF-8?q?=20"Implement=20additional=20ad=20event=20confirmations?= =?UTF-8?q?=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fixes https://github.com/brave/brave-browser/issues/3679 --- vendor/bat-native-ads/include/bat/ads/ads_client.h | 4 ++-- .../include/bat/ads/client_info_platform_type.h | 4 +--- vendor/bat-native-ads/include/bat/ads/confirmation_type.h | 6 +----- .../include/bat/ads/notification_result_type.h | 4 +--- vendor/bat-native-ads/include/bat/ads/result.h | 4 +--- .../include/bat/confirmations/confirmation_type.h | 2 +- 6 files changed, 7 insertions(+), 17 deletions(-) diff --git a/vendor/bat-native-ads/include/bat/ads/ads_client.h b/vendor/bat-native-ads/include/bat/ads/ads_client.h index 644c8e53bd1..161e9c79660 100644 --- a/vendor/bat-native-ads/include/bat/ads/ads_client.h +++ b/vendor/bat-native-ads/include/bat/ads/ads_client.h @@ -25,13 +25,13 @@ namespace ads { -enum ADS_EXPORT LogLevel { +enum LogLevel { LOG_ERROR = 1, LOG_WARNING, LOG_INFO }; -enum ADS_EXPORT URLRequestMethod { +enum URLRequestMethod { GET = 0, PUT = 1, POST = 2 diff --git a/vendor/bat-native-ads/include/bat/ads/client_info_platform_type.h b/vendor/bat-native-ads/include/bat/ads/client_info_platform_type.h index c396a6acfcb..2259ae02aa8 100644 --- a/vendor/bat-native-ads/include/bat/ads/client_info_platform_type.h +++ b/vendor/bat-native-ads/include/bat/ads/client_info_platform_type.h @@ -6,11 +6,9 @@ #ifndef BAT_ADS_CLIENT_INFO_PLATFORM_TYPE_H_ #define BAT_ADS_CLIENT_INFO_PLATFORM_TYPE_H_ -#include "bat/ads/export.h" - namespace ads { -enum ADS_EXPORT ClientInfoPlatformType { +enum ClientInfoPlatformType { UNKNOWN, WINDOWS, MACOS, diff --git a/vendor/bat-native-ads/include/bat/ads/confirmation_type.h b/vendor/bat-native-ads/include/bat/ads/confirmation_type.h index 0df5f271cd6..d5983438887 100644 --- a/vendor/bat-native-ads/include/bat/ads/confirmation_type.h +++ b/vendor/bat-native-ads/include/bat/ads/confirmation_type.h @@ -6,10 +6,6 @@ #ifndef BAT_ADS_CONFIRMATION_TYPE_H_ #define BAT_ADS_CONFIRMATION_TYPE_H_ -#include - -#include "bat/ads/export.h" - namespace ads { static char kConfirmationTypeClick[] = "click"; @@ -17,7 +13,7 @@ static char kConfirmationTypeDismiss[] = "dismiss"; static char kConfirmationTypeView[] = "view"; static char kConfirmationTypeLanded[] = "landed"; -enum class ADS_EXPORT ConfirmationType { +enum class ConfirmationType { UNKNOWN, CLICK, DISMISS, diff --git a/vendor/bat-native-ads/include/bat/ads/notification_result_type.h b/vendor/bat-native-ads/include/bat/ads/notification_result_type.h index de80db7ced0..9120b8cb257 100644 --- a/vendor/bat-native-ads/include/bat/ads/notification_result_type.h +++ b/vendor/bat-native-ads/include/bat/ads/notification_result_type.h @@ -6,11 +6,9 @@ #ifndef BAT_ADS_NOTIFICATION_RESULT_TYPE_H_ #define BAT_ADS_NOTIFICATION_RESULT_TYPE_H_ -#include "bat/ads/export.h" - namespace ads { -enum class ADS_EXPORT NotificationResultInfoResultType { +enum class NotificationResultInfoResultType { CLICKED, DISMISSED, TIMEOUT diff --git a/vendor/bat-native-ads/include/bat/ads/result.h b/vendor/bat-native-ads/include/bat/ads/result.h index 1c6fb385057..6099caad22a 100644 --- a/vendor/bat-native-ads/include/bat/ads/result.h +++ b/vendor/bat-native-ads/include/bat/ads/result.h @@ -6,11 +6,9 @@ #ifndef BAT_ADS_RESULT_H_ #define BAT_ADS_RESULT_H_ -#include "bat/ads/export.h" - namespace ads { -enum ADS_EXPORT Result { +enum Result { SUCCESS, FAILED }; diff --git a/vendor/bat-native-confirmations/include/bat/confirmations/confirmation_type.h b/vendor/bat-native-confirmations/include/bat/confirmations/confirmation_type.h index 50440ac38bf..7bb24582b8c 100644 --- a/vendor/bat-native-confirmations/include/bat/confirmations/confirmation_type.h +++ b/vendor/bat-native-confirmations/include/bat/confirmations/confirmation_type.h @@ -17,7 +17,7 @@ static char kConfirmationTypeDismiss[] = "dismiss"; static char kConfirmationTypeView[] = "view"; static char kConfirmationTypeLanded[] = "landed"; -enum class CONFIRMATIONS_EXPORT ConfirmationType { +enum class ConfirmationType { UNKNOWN, CLICK, DISMISS,