From 1790e9f28ca36cca38d823bd1fc350cd40667017 Mon Sep 17 00:00:00 2001 From: kgv Date: Fri, 11 Jun 2021 14:52:37 +0300 Subject: [PATCH] 0032430: Coding Rules - eliminate CLang warning -Wdeprecated-copy Introduced Standard_DELETE alias to C++11 feature "=delete". --- src/Extrema/Extrema_ExtCC.hxx | 4 ++-- src/Extrema/Extrema_ExtCS.hxx | 4 ++-- src/Extrema/Extrema_GenExtCS.hxx | 4 ++-- src/Extrema/Extrema_GenExtPS.hxx | 4 ++-- src/Extrema/Extrema_GenExtSS.hxx | 4 ++-- src/Standard/Standard_Macro.hxx | 12 ++++++++++++ 6 files changed, 22 insertions(+), 10 deletions(-) diff --git a/src/Extrema/Extrema_ExtCC.hxx b/src/Extrema/Extrema_ExtCC.hxx index 9521c2833e..f3a41288ff 100644 --- a/src/Extrema/Extrema_ExtCC.hxx +++ b/src/Extrema/Extrema_ExtCC.hxx @@ -143,8 +143,8 @@ protected: private: // disallow copies - Extrema_ExtCC (Extrema_ExtCC& ); - Extrema_ExtCC& operator= (Extrema_ExtCC& ); + Extrema_ExtCC (Extrema_ExtCC& ) Standard_DELETE; + Extrema_ExtCC& operator= (Extrema_ExtCC& ) Standard_DELETE; private: diff --git a/src/Extrema/Extrema_ExtCS.hxx b/src/Extrema/Extrema_ExtCS.hxx index 689a8f67fa..f0f138f81c 100644 --- a/src/Extrema/Extrema_ExtCS.hxx +++ b/src/Extrema/Extrema_ExtCS.hxx @@ -87,8 +87,8 @@ private: private: // disallow copies - Extrema_ExtCS (Extrema_ExtCS& ); - Extrema_ExtCS& operator= (Extrema_ExtCS& ); + Extrema_ExtCS (Extrema_ExtCS& ) Standard_DELETE; + Extrema_ExtCS& operator= (Extrema_ExtCS& ) Standard_DELETE; private: diff --git a/src/Extrema/Extrema_GenExtCS.hxx b/src/Extrema/Extrema_GenExtCS.hxx index 758850aed9..6b141077d2 100644 --- a/src/Extrema/Extrema_GenExtCS.hxx +++ b/src/Extrema/Extrema_GenExtCS.hxx @@ -108,8 +108,8 @@ private: private: // disallow copies - Extrema_GenExtCS (const Extrema_GenExtCS& ); - Extrema_GenExtCS& operator= (const Extrema_GenExtCS& ); + Extrema_GenExtCS (const Extrema_GenExtCS& ) Standard_DELETE; + Extrema_GenExtCS& operator= (const Extrema_GenExtCS& ) Standard_DELETE; private: diff --git a/src/Extrema/Extrema_GenExtPS.hxx b/src/Extrema/Extrema_GenExtPS.hxx index 3f64783bd3..fc14c4874d 100644 --- a/src/Extrema/Extrema_GenExtPS.hxx +++ b/src/Extrema/Extrema_GenExtPS.hxx @@ -110,8 +110,8 @@ private: private: // disallow copies - Extrema_GenExtPS (const Extrema_GenExtPS& ); - Extrema_GenExtPS& operator= (const Extrema_GenExtPS& ); + Extrema_GenExtPS (const Extrema_GenExtPS& ) Standard_DELETE; + Extrema_GenExtPS& operator= (const Extrema_GenExtPS& ) Standard_DELETE; private: diff --git a/src/Extrema/Extrema_GenExtSS.hxx b/src/Extrema/Extrema_GenExtSS.hxx index 5e3e5ed0b4..c8fb24a06a 100644 --- a/src/Extrema/Extrema_GenExtSS.hxx +++ b/src/Extrema/Extrema_GenExtSS.hxx @@ -89,8 +89,8 @@ public: private: // disallow copies - Extrema_GenExtSS (const Extrema_GenExtSS& ); - Extrema_GenExtSS& operator= (const Extrema_GenExtSS& ); + Extrema_GenExtSS (const Extrema_GenExtSS& ) Standard_DELETE; + Extrema_GenExtSS& operator= (const Extrema_GenExtSS& ) Standard_DELETE; private: diff --git a/src/Standard/Standard_Macro.hxx b/src/Standard/Standard_Macro.hxx index 86cd3bad9c..b634410eb3 100644 --- a/src/Standard/Standard_Macro.hxx +++ b/src/Standard/Standard_Macro.hxx @@ -37,6 +37,18 @@ #define Standard_OVERRIDE #endif +//! @def Standard_DELETE +//! Alias for C++11 keyword "=delete" marking methods to be deleted. +#if defined(__cplusplus) && (__cplusplus >= 201100L) + // part of C++11 standard + #define Standard_DELETE =delete +#elif defined(_MSC_VER) && (_MSC_VER >= 1800) + // implemented since VS2013 + #define Standard_DELETE =delete +#else + #define Standard_DELETE +#endif + //! @def Standard_FALLTHROUGH //! Should be used in a switch statement immediately before a case label, //! if code associated with the previous case label may fall through to that