From 15d8133a215a1f1d93c40714455e9f4e8afb4013 Mon Sep 17 00:00:00 2001 From: Anton Kolesnyk <41349689+antkmsft@users.noreply.github.com> Date: Wed, 25 Oct 2023 22:55:21 -0700 Subject: [PATCH] Prefix interal macros with _azure_ to 'remove' them from the public area (#5064) * Prefix interal macros with _azure_ to 'remove' them from the public area * PR feedback --------- Co-authored-by: Anton Kolesnyk --- .../inc/azure/messaging/eventhubs/processor.hpp | 4 ++-- .../src/private/processor_load_balancer.hpp | 4 ++-- .../azure-messaging-eventhubs/src/private/retry_operation.hpp | 4 ++-- sdk/eventhubs/azure-messaging-eventhubs/test/CMakeLists.txt | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/processor.hpp b/sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/processor.hpp index 2e65e1f9a..509b274d7 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/processor.hpp +++ b/sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/processor.hpp @@ -12,7 +12,7 @@ #include #include -#ifdef azure_TESTING_BUILD_AMQP +#ifdef _azure_TESTING_BUILD_AMQP namespace Azure { namespace Messaging { namespace EventHubs { namespace Test { class ProcessorTest_LoadBalancing_Test; }}}} // namespace Azure::Messaging::EventHubs::Test @@ -80,7 +80,7 @@ namespace Azure { namespace Messaging { namespace EventHubs { * between multiple Processor instances, even in separate processes or on separate machines. */ class Processor final { -#ifdef azure_TESTING_BUILD_AMQP +#ifdef _azure_TESTING_BUILD_AMQP friend class Test::ProcessorTest_LoadBalancing_Test; #endif diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/private/processor_load_balancer.hpp b/sdk/eventhubs/azure-messaging-eventhubs/src/private/processor_load_balancer.hpp index e532a8e02..766ab1415 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs/src/private/processor_load_balancer.hpp +++ b/sdk/eventhubs/azure-messaging-eventhubs/src/private/processor_load_balancer.hpp @@ -12,7 +12,7 @@ #include -#ifdef azure_TESTING_BUILD_AMQP +#ifdef _azure_TESTING_BUILD_AMQP namespace Azure { namespace Messaging { namespace EventHubs { namespace Test { class ProcessorLoadBalancerTest_Greedy_EnoughUnownedPartitions_Test; class ProcessorLoadBalancerTest_Balanced_UnownedPartitions_Test; @@ -63,7 +63,7 @@ namespace Azure { namespace Messaging { namespace EventHubs { namespace _detail * between multiple Processor instances, even in separate processes or on separate machines. */ class ProcessorLoadBalancer final { -#ifdef azure_TESTING_BUILD_AMQP +#ifdef _azure_TESTING_BUILD_AMQP friend class Test::ProcessorLoadBalancerTest_Greedy_EnoughUnownedPartitions_Test; friend class Test::ProcessorLoadBalancerTest_Balanced_UnownedPartitions_Test; friend class Test::ProcessorLoadBalancerTest_Greedy_ForcedToSteal_Test; diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/private/retry_operation.hpp b/sdk/eventhubs/azure-messaging-eventhubs/src/private/retry_operation.hpp index 69459c489..e898ef649 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs/src/private/retry_operation.hpp +++ b/sdk/eventhubs/azure-messaging-eventhubs/src/private/retry_operation.hpp @@ -7,7 +7,7 @@ #include #include -#if defined(azure_TESTING_BUILD_AMQP) +#if defined(_azure_TESTING_BUILD_AMQP) // Define the class used from tests to validate retry enabled namespace Azure { namespace Messaging { namespace EventHubs { namespace _internal { namespace Test { class RetryOperationTest_ShouldRetryTrue1_Test; @@ -18,7 +18,7 @@ namespace Azure { namespace Messaging { namespace EventHubs { namespace _interna #endif namespace Azure { namespace Messaging { namespace EventHubs { namespace _detail { class RetryOperation { -#if defined(azure_TESTING_BUILD_AMQP) +#if defined(_azure_TESTING_BUILD_AMQP) // make tests classes friends to validate set Retry friend class Azure::Messaging::EventHubs::_internal::Test:: RetryOperationTest_ShouldRetryTrue1_Test; diff --git a/sdk/eventhubs/azure-messaging-eventhubs/test/CMakeLists.txt b/sdk/eventhubs/azure-messaging-eventhubs/test/CMakeLists.txt index 789d983b1..faea3fced 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs/test/CMakeLists.txt +++ b/sdk/eventhubs/azure-messaging-eventhubs/test/CMakeLists.txt @@ -7,7 +7,7 @@ cmake_minimum_required (VERSION 3.13) if(BUILD_TESTING) - add_compile_definitions(azure_TESTING_BUILD_AMQP) + add_compile_definitions(_azure_TESTING_BUILD_AMQP) if (NOT AZ_ALL_LIBRARIES OR FETCH_SOURCE_DEPS) include(AddGoogleTest) enable_testing ()