diff options
author | Shauren <shauren.trinity@gmail.com> | 2011-04-22 13:41:58 +0200 |
---|---|---|
committer | Shauren <shauren.trinity@gmail.com> | 2011-04-22 13:41:58 +0200 |
commit | 40cb0718c2cbcba3eda73bae4500c882b4604b26 (patch) | |
tree | 0aa417c152dabeaa0314c6dad119b869f295e1e6 | |
parent | 18c9038ca79061b17a5f936d415cb176f8e4eb1d (diff) |
Core: Added definitions to mark methods as deprecated and marked DoCompleteAchievement as such
-rwxr-xr-x | src/server/game/Instances/InstanceScript.h | 3 | ||||
-rwxr-xr-x | src/server/shared/Define.h | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/server/game/Instances/InstanceScript.h b/src/server/game/Instances/InstanceScript.h index aee13dce1a6..d099f9471af 100755 --- a/src/server/game/Instances/InstanceScript.h +++ b/src/server/game/Instances/InstanceScript.h @@ -169,7 +169,7 @@ class InstanceScript : public ZoneScript void DoSendNotifyToInstance(char const* format, ...); // Complete Achievement for all players in instance - void DoCompleteAchievement(uint32 achievement); + DECLSPEC_DEPRECATED void DoCompleteAchievement(uint32 achievement) ATTR_DEPRECATED; // Update Achievement Criteria for all players in instance void DoUpdateAchievementCriteria(AchievementCriteriaTypes type, uint32 miscValue1 = 0, uint32 miscValue2 = 0, Unit* unit = NULL); @@ -231,4 +231,3 @@ class InstanceScript : public ZoneScript uint32 completedEncounters; // completed encounter mask, bit indexes are DungeonEncounter.dbc boss numbers, used for packets }; #endif - diff --git a/src/server/shared/Define.h b/src/server/shared/Define.h index d5edbd68b7b..46762c5d7e4 100755 --- a/src/server/shared/Define.h +++ b/src/server/shared/Define.h @@ -42,9 +42,13 @@ # ifndef DECLSPEC_NORETURN # define DECLSPEC_NORETURN __declspec(noreturn) # endif //DECLSPEC_NORETURN +# ifndef DECLSPEC_DEPRECATED +# define DECLSPEC_DEPRECATED __declspec(deprecated) +# endif //DECLSPEC_DEPRECATED #else //PLATFORM != PLATFORM_WINDOWS # define TRINITY_PATH_MAX PATH_MAX # define DECLSPEC_NORETURN +# define DECLSPEC_DEPRECATED #endif //PLATFORM #if !defined(COREDEBUG) @@ -59,9 +63,11 @@ #if COMPILER == COMPILER_GNU # define ATTR_NORETURN __attribute__((noreturn)) # define ATTR_PRINTF(F,V) __attribute__ ((format (printf, F, V))) +# define ATTR_DEPRECATED __attribute__((deprecated)) #else //COMPILER != COMPILER_GNU # define ATTR_NORETURN # define ATTR_PRINTF(F,V) +# define ATTR_DEPRECATED #endif //COMPILER == COMPILER_GNU typedef ACE_INT64 int64; |