Merge pull request #2232 from jwillemsen/jwi-acedrepcated

Define ACE_DEPRECATED as [[deprecated]]
DOCGroup · Apr 30, 2024 · 4fa3d39 · 4fa3d39
2 parents 42c460d + e8fa636
commit 4fa3d39
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
diff --git a/ACE/ace/config-g++-common.h b/ACE/ace/config-g++-common.h
@@ -60,10 +60,6 @@
 #define ACE_HAS_GCC_DESTRUCTOR_ATTRIBUTE 1
 #endif
 
-#if !defined (ACE_HAS_GCC_DEPRECATED_ATTRIBUTE)
-#define ACE_HAS_GCC_DEPRECATED_ATTRIBUTE 1
-#endif
-
 #if !defined (ACE_HAS_GCC_FORMAT_ATTRIBUTE)
 #define ACE_HAS_GCC_FORMAT_ATTRIBUTE 1
 #endif
@@ -76,10 +72,6 @@
 # define ACE_GCC_DESTRUCTOR_ATTRIBUTE __attribute__ ((destructor))
 #endif
 
-#if (ACE_HAS_GCC_DEPRECATED_ATTRIBUTE == 1)
-#define ACE_DEPRECATED __attribute__ ((deprecated))
-#endif
-
 #if (ACE_HAS_GCC_FORMAT_ATTRIBUTE == 1)
 # define ACE_GCC_FORMAT_ATTRIBUTE(TYPE, STR_INDEX, FIRST_INDEX) \
    __attribute__ ((format (TYPE, STR_INDEX, FIRST_INDEX)))

diff --git a/ACE/ace/config-macros.h b/ACE/ace/config-macros.h
@@ -680,7 +680,7 @@ extern "C" u_long CLS##_Export _get_dll_unload_policy () \
 #endif
 
 #ifndef ACE_DEPRECATED
-# define ACE_DEPRECATED
+# define ACE_DEPRECATED [[deprecated]]
 #endif
 
 #ifndef ACE_HAS_REACTOR_NOTIFICATION_QUEUE