Skip to content

Commit 1031b67

Browse files
mprettner-huaweimprettner-huawei
committed
Change some instances of the disable-dll-export-baseclass-warning macro to push/pop version
Signed-off-by: Markus Prettner <[email protected]>
1 parent db26b53 commit 1031b67

File tree

4 files changed

+17
-11
lines changed

4 files changed

+17
-11
lines changed

‎Code/Framework/AzCore/AzCore/EBus/EBus.h

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2252,9 +2252,9 @@ namespace AZ \
22522252
#define DECLARE_EBUS_EXTERN_DLL_SINGLE_ADDRESS(a) \
22532253
namespace AZ \
22542254
{ \
2255-
extern template class AZCORE_API_EXTERN EBus<a, a>; \
22562255
AZ_PUSH_DISABLE_DLL_EXPORT_BASECLASS_WARNING \
22572256
AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING \
2257+
extern template class AZCORE_API_EXTERN EBus<a, a>; \
22582258
extern template class AZCORE_API_EXTERN Internal::NonIdHandler<a, a, EBus<a, a>::BusesContainer>; \
22592259
extern template struct AZCORE_API_EXTERN Internal::EBusCallstackStorage<Internal::CallstackEntryBase<a, a>, true>; \
22602260
AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING \
@@ -2265,8 +2265,8 @@ namespace AZ \
22652265
#define DECLARE_EBUS_INSTANTIATION_DLL_SINGLE_ADDRESS(a) \
22662266
namespace AZ \
22672267
{ \
2268-
template class AZ_DLL_EXPORT EBus<a, a>; \
22692268
AZ_PUSH_DISABLE_DLL_EXPORT_BASECLASS_WARNING \
2269+
template class AZ_DLL_EXPORT EBus<a, a>; \
22702270
template class AZ_DLL_EXPORT Internal::NonIdHandler<a, a, EBus<a, a>::BusesContainer>; \
22712271
template struct AZ_DLL_EXPORT Internal::EBusCallstackStorage<Internal::CallstackEntryBase<a, a>, true>; \
22722272
AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING \
@@ -2277,9 +2277,9 @@ namespace AZ \
22772277
#define DECLARE_EBUS_EXTERN_DLL_MULTI_ADDRESS(a) \
22782278
namespace AZ \
22792279
{ \
2280-
extern template class AZCORE_API_EXTERN EBus<a, a>; \
22812280
AZ_PUSH_DISABLE_DLL_EXPORT_BASECLASS_WARNING \
22822281
AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING \
2282+
extern template class AZCORE_API_EXTERN EBus<a, a>; \
22832283
extern template class AZCORE_API_EXTERN Internal::IdHandler<a, a, EBus<a, a>::BusesContainer>; \
22842284
extern template class AZCORE_API_EXTERN Internal::MultiHandler<a, a, EBus<a, a>::BusesContainer>; \
22852285
extern template struct AZCORE_API_EXTERN Internal::EBusCallstackStorage<Internal::CallstackEntryBase<a, a>, true>; \
@@ -2291,8 +2291,8 @@ namespace AZ \
22912291
#define DECLARE_EBUS_INSTANTIATION_DLL_MULTI_ADDRESS(a) \
22922292
namespace AZ \
22932293
{ \
2294-
template class AZ_DLL_EXPORT EBus<a, a>; \
22952294
AZ_PUSH_DISABLE_DLL_EXPORT_BASECLASS_WARNING \
2295+
template class AZ_DLL_EXPORT EBus<a, a>; \
22962296
template class AZ_DLL_EXPORT Internal::IdHandler<a, a, EBus<a, a>::BusesContainer>; \
22972297
template class AZ_DLL_EXPORT Internal::MultiHandler<a, a, EBus<a, a>::BusesContainer>; \
22982298
template struct AZ_DLL_EXPORT Internal::EBusCallstackStorage<Internal::CallstackEntryBase<a, a>, true>; \
@@ -2304,9 +2304,9 @@ namespace AZ \
23042304
#define DECLARE_EBUS_EXTERN_DLL_SINGLE_ADDRESS_WITH_TRAITS(a, b) \
23052305
namespace AZ \
23062306
{ \
2307-
extern template class AZCORE_API_EXTERN EBus<a, b>; \
23082307
AZ_PUSH_DISABLE_DLL_EXPORT_BASECLASS_WARNING \
23092308
AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING \
2309+
extern template class AZCORE_API_EXTERN EBus<a, b>; \
23102310
extern template class AZCORE_API_EXTERN Internal::NonIdHandler<a, b, EBus<a, b>::BusesContainer>; \
23112311
extern template struct AZCORE_API_EXTERN Internal::EBusCallstackStorage<Internal::CallstackEntryBase<a, b>, true>; \
23122312
AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING \
@@ -2317,8 +2317,8 @@ namespace AZ \
23172317
#define DECLARE_EBUS_INSTANTIATION_DLL_SINGLE_ADDRESS_WITH_TRAITS(a, b) \
23182318
namespace AZ \
23192319
{ \
2320-
template class AZ_DLL_EXPORT EBus<a, b>; \
23212320
AZ_PUSH_DISABLE_DLL_EXPORT_BASECLASS_WARNING \
2321+
template class AZ_DLL_EXPORT EBus<a, b>; \
23222322
template class AZ_DLL_EXPORT Internal::NonIdHandler<a, b, EBus<a, b>::BusesContainer>; \
23232323
template struct AZ_DLL_EXPORT Internal::EBusCallstackStorage<Internal::CallstackEntryBase<a, b>, true>; \
23242324
AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING \
@@ -2329,9 +2329,9 @@ namespace AZ \
23292329
#define DECLARE_EBUS_EXTERN_DLL_MULTI_ADDRESS_WITH_TRAITS(a, b) \
23302330
namespace AZ \
23312331
{ \
2332-
extern template class AZCORE_API_EXTERN EBus<a, b>; \
23332332
AZ_PUSH_DISABLE_DLL_EXPORT_BASECLASS_WARNING \
23342333
AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING \
2334+
extern template class AZCORE_API_EXTERN EBus<a, b>; \
23352335
extern template class AZCORE_API_EXTERN Internal::IdHandler<a, b, EBus<a, b>::BusesContainer>; \
23362336
extern template class AZCORE_API_EXTERN Internal::MultiHandler<a, b, EBus<a, b>::BusesContainer>; \
23372337
extern template struct AZCORE_API_EXTERN Internal::EBusCallstackStorage<Internal::CallstackEntryBase<a, b>, true>; \
@@ -2343,8 +2343,8 @@ namespace AZ \
23432343
#define DECLARE_EBUS_INSTANTIATION_DLL_MULTI_ADDRESS_WITH_TRAITS(a, b) \
23442344
namespace AZ \
23452345
{ \
2346-
template class AZ_DLL_EXPORT EBus<a, b>; \
23472346
AZ_PUSH_DISABLE_DLL_EXPORT_BASECLASS_WARNING \
2347+
template class AZ_DLL_EXPORT EBus<a, b>; \
23482348
template class AZ_DLL_EXPORT Internal::IdHandler<a, b, EBus<a, b>::BusesContainer>; \
23492349
template class AZ_DLL_EXPORT Internal::MultiHandler<a, b, EBus<a, b>::BusesContainer>; \
23502350
template struct AZ_DLL_EXPORT Internal::EBusCallstackStorage<Internal::CallstackEntryBase<a, b>, true>; \

‎Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Image/AttachmentImagePool.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,11 @@ namespace AZ
2424
{
2525
class ResourcePoolAsset;
2626

27+
AZ_PUSH_DISABLE_DLL_EXPORT_BASECLASS_WARNING
2728
class ATOM_RPI_PUBLIC_API AttachmentImagePool final
28-
: public AZ_DISABLE_DLL_EXPORT_BASECLASS_WARNING(Data::InstanceData)
29+
: public Data::InstanceData
2930
{
31+
AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING
3032
friend class ImageSystem;
3133

3234
public:

‎Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Asset/BuiltInAssetHandler.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,11 @@ namespace AZ
9393
//! Data::Asset<Bar> m_bar1;
9494
//! Data::Asset<Bar> m_bar2;
9595
//! };
96+
AZ_PUSH_DISABLE_DLL_EXPORT_BASECLASS_WARNING
9697
class ATOM_RPI_REFLECT_API BuiltInAssetHandler
97-
: public AZ_DISABLE_DLL_EXPORT_BASECLASS_WARNING(Data::AssetHandler)
98+
: public Data::AssetHandler
9899
{
100+
AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING
99101
public:
100102
AZ_CLASS_ALLOCATOR(BuiltInAssetHandler, AZ::SystemAllocator);
101103
AZ_RTTI(BuiltInAssetHandler, "{C6615D6C-72AF-4444-8C27-8B88D89074E8}", Data::AssetHandler);

‎Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Image/Image.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,11 @@ namespace AZ
2525
class ImageAsset;
2626

2727
//! A base class for images providing access to common image information.
28+
AZ_PUSH_DISABLE_DLL_EXPORT_BASECLASS_WARNING
2829
class ATOM_RPI_REFLECT_API Image
29-
: public AZ_DISABLE_DLL_EXPORT_BASECLASS_WARNING(Data::InstanceData)
30+
: public Data::InstanceData
3031
{
32+
AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING
3133
friend class ImageSystem;
3234

3335
public:

0 commit comments

Comments
 (0)