Warning: used PUSH/POP macro (#140)

LibertyGlobal · Mar 16, 2022 · a3e302d · a3e302d
1 parent 30b03ac
commit a3e302d
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 68 deletions.
diff --git a/LocationSync/LocationService.cpp b/LocationSync/LocationService.cpp
@@ -324,9 +324,7 @@ namespace Plugin {
         return (index < (sizeof(g_domainFactory) / sizeof(DomainConstructor)) ? &(g_domainFactory[index]) : nullptr);
     }
 
-#ifdef __WINDOWS__
-#pragma warning(disable : 4355)
-#endif
+PUSH_WARNING(DISABLE_WARNING_THIS_IN_MEMBER_INITIALIZER_LIST)
     LocationService::LocationService(Core::IDispatchType<void>* callback)
         : BaseClass(1, g_Factory, false, Core::NodeId(), Core::NodeId(), 256, 1024)
         , _adminLock()
@@ -347,9 +345,7 @@ namespace Plugin {
         , _request(Core::ProxyType<Web::Request>::Create())
     {
     }
-#ifdef __WINDOWS__
-#pragma warning(default : 4355)
-#endif
+POP_WARNING()
 
     LocationService::~LocationService() /* override */
     {

diff --git a/LocationSync/LocationSync.cpp b/LocationSync/LocationSync.cpp
@@ -27,9 +27,7 @@ namespace Plugin {
     static Core::ProxyPoolType<Web::Response> responseFactory(4);
     static Core::ProxyPoolType<Web::JSONBodyType<LocationSync::Data>> jsonResponseFactory(4);
 
-#ifdef __WINDOWS__
-#pragma warning(disable : 4355)
-#endif
+PUSH_WARNING(DISABLE_WARNING_THIS_IN_MEMBER_INITIALIZER_LIST)
     LocationSync::LocationSync()
         : _skipURL(0)
         , _source()
@@ -38,9 +36,7 @@ namespace Plugin {
     {
         RegisterAll();
     }
-#ifdef __WINDOWS__
-#pragma warning(default : 4355)
-#endif
+POP_WARNING()
 
     LocationSync::~LocationSync() /* override */
     {

diff --git a/LocationSync/LocationSync.h b/LocationSync/LocationSync.h
@@ -69,9 +69,7 @@ namespace Plugin {
             Notification& operator=(const Notification&) = delete;
 
         public:
-#ifdef __WINDOWS__
-#pragma warning(disable : 4355)
-#endif
+PUSH_WARNING(DISABLE_WARNING_THIS_IN_MEMBER_INITIALIZER_LIST)
             explicit Notification(LocationSync* parent)
                 : _parent(*parent)
                 , _source()
@@ -81,9 +79,7 @@ namespace Plugin {
             {
                 ASSERT(parent != nullptr);
             }
-#ifdef __WINDOWS__
-#pragma warning(default : 4355)
-#endif
+POP_WARNING()
             ~Notification()
             {
                 _locator->Release();

diff --git a/Messenger/Messenger.h b/Messenger/Messenger.h
@@ -37,10 +37,7 @@ namespace Plugin {
         Messenger(const Messenger&) = delete;
         Messenger& operator=(const Messenger&) = delete;
 
-#ifdef __WINDOWS__
-#pragma warning(disable : 4355)
-#endif
-
+PUSH_WARNING(DISABLE_WARNING_THIS_IN_MEMBER_INITIALIZER_LIST)
         Messenger()
             : PluginHost::JSONRPCSupportsEventStatus(std::bind(&Messenger::CheckToken, this,
                     std::placeholders::_1, std::placeholders::_2, std::placeholders::_3))
@@ -52,9 +49,7 @@ namespace Plugin {
         {
             RegisterAll();
         }
-#ifdef __WINDOWS__
-#pragma warning(default : 4355)
-#endif
+POP_WARNING()
 
         ~Messenger()
         {

diff --git a/Monitor/Monitor.h b/Monitor/Monitor.h
@@ -657,9 +657,7 @@ namespace Plugin {
             MonitorObjects(const MonitorObjects&) = delete;
             MonitorObjects& operator=(const MonitorObjects&) = delete;
 
-#ifdef __WINDOWS__
-#pragma warning(disable : 4355)
-#endif
+PUSH_WARNING(DISABLE_WARNING_THIS_IN_MEMBER_INITIALIZER_LIST)
             MonitorObjects(Monitor* parent)
                 : _adminLock()
                 , _monitor()
@@ -668,9 +666,6 @@ namespace Plugin {
                 , _parent(*parent)
             {
             }
-#ifdef __WINDOWS__
-#pragma warning(default : 4355)
-#endif
             virtual ~MonitorObjects()
             {
                 ASSERT(_monitor.size() == 0);
@@ -1007,18 +1002,14 @@ namespace Plugin {
         };
 
     public:
-#ifdef __WINDOWS__
-#pragma warning(disable : 4355)
-#endif
+PUSH_WARNING(DISABLE_WARNING_THIS_IN_MEMBER_INITIALIZER_LIST)
         Monitor()
             : _skipURL(0)
             , _monitor(Core::Service<MonitorObjects>::Create<MonitorObjects>(this))
         {
             RegisterAll();
         }
-#ifdef __WINDOWS__
-#pragma warning(default : 4355)
-#endif
+POP_WARNING()
         virtual ~Monitor()
         {
             UnregisterAll();

diff --git a/OpenCDMi/FrameworkRPC.cpp b/OpenCDMi/FrameworkRPC.cpp
@@ -447,9 +447,7 @@ namespace Plugin {
                 };
 
             public:
-                #ifdef __WINDOWS__
-                #pragma warning(disable : 4355)
-                #endif
+PUSH_WARNING(DISABLE_WARNING_THIS_IN_MEMBER_INITIALIZER_LIST)
                 SessionImplementation(
                     AccessorOCDM* parent,
                     const std::string keySystem,
@@ -502,9 +500,7 @@ namespace Plugin {
                     _mediaKeySession->Run(&_sink);
                     TRACE(Trace::Information, (_T("Constructed the Session Server side: %p"), this));
                 }
-                #ifdef __WINDOWS__
-                #pragma warning(default : 4355)
-                #endif
+POP_WARNING()
 
                 virtual ~SessionImplementation()
                 {

diff --git a/OpenCDMi/OCDM.h b/OpenCDMi/OCDM.h
@@ -143,9 +143,7 @@ namespace Plugin {
         };
 
     public:
-        #ifdef __WINDOWS__
-        #pragma warning(disable : 4355)
-        #endif
+PUSH_WARNING(DISABLE_WARNING_THIS_IN_MEMBER_INITIALIZER_LIST)
         OCDM()
             : _service(nullptr)
             , _opencdmi(nullptr)
@@ -154,9 +152,7 @@ namespace Plugin {
         {
             RegisterAll();
         }
-        #ifdef __WINDOWS__
-        #pragma warning(default : 4355)
-        #endif
+POP_WARNING()
         virtual ~OCDM()
         {
             UnregisterAll();

diff --git a/TraceControl/TraceControl.h b/TraceControl/TraceControl.h
@@ -929,9 +929,7 @@ namespace Plugin {
         };
 
     public:
-#ifdef __WINDOWS__
-#pragma warning(disable : 4355)
-#endif
+PUSH_WARNING(DISABLE_WARNING_THIS_IN_MEMBER_INITIALIZER_LIST)
         TraceControl()
             : _skipURL(0)
             , _service(nullptr)
@@ -941,9 +939,7 @@ namespace Plugin {
         {
             RegisterAll();
         }
-#ifdef __WINDOWS__
-#pragma warning(default : 4355)
-#endif
+POP_WARNING()
         ~TraceControl() override
         {
             UnregisterAll();

diff --git a/WarningReportingControl/WarningReportingControl.h b/WarningReportingControl/WarningReportingControl.h
@@ -381,9 +381,7 @@ class WebSocketExporter;
         };
 
     public:
-#ifdef __WINDOWS__
-#pragma warning(disable : 4355)
-#endif
+PUSH_WARNING(DISABLE_WARNING_THIS_IN_MEMBER_INITIALIZER_LIST)
         WarningReportingControl()
             : _service(nullptr)
             , _config()
@@ -394,9 +392,7 @@ class WebSocketExporter;
             , _outputOnlyWarnings(false)
         {
         }
-#ifdef __WINDOWS__
-#pragma warning(default : 4355)
-#endif
+POP_WARNING()
         ~WarningReportingControl() override
         {
         }

diff --git a/WebBridge/WebBridge.h b/WebBridge/WebBridge.h
@@ -158,9 +158,7 @@ namespace WPEFramework {
             WebBridge(const WebBridge&) = delete;
             WebBridge& operator=(const WebBridge&) = delete;
 
-#ifdef __WINDOWS__
-#pragma warning(disable: 4355)
-#endif
+PUSH_WARNING(DISABLE_WARNING_THIS_IN_MEMBER_INITIALIZER_LIST)
             WebBridge()
                 : _adminLock()
                 , _skipURL(0)
@@ -176,9 +174,7 @@ namespace WPEFramework {
                 , _cleaner(*this)
             {
             }
-#ifdef __WINDOWS__
-#pragma warning(default: 4355)
-#endif
+POP_WARNING()
             ~WebBridge() override = default;
 
             BEGIN_INTERFACE_MAP(WebBridge)
@@ -354,4 +350,4 @@ namespace WPEFramework {
         };
 
     } // namespace Plugin
-} // namespace WPEFramework
+} // namespace WPEFramework