Define SG_DEPRECATED, remove unused DEPRECATED.
Use this to mark two Package APIs as deprecated.
This commit is contained in:
parent
f3e83cf020
commit
fe87e7f60d
@ -109,10 +109,13 @@
|
||||
# define SG_UNIX
|
||||
#endif
|
||||
|
||||
#if defined( __GNUC__ )
|
||||
# define DEPRECATED __attribute__ ((deprecated))
|
||||
#ifdef __GNUC__
|
||||
#define SG_DEPRECATED(func) func __attribute__ ((deprecated))
|
||||
#elif defined(_MSC_VER)
|
||||
#define SG_DEPRECATED(func) __declspec(deprecated) func
|
||||
#else
|
||||
# define DEPRECATED
|
||||
#pragma message("WARNING: You need to implement SG_DEPRECATED for this compiler")
|
||||
#define SG_DEPRECATED(func) func
|
||||
#endif
|
||||
|
||||
#if defined(__clang__)
|
||||
|
@ -102,7 +102,7 @@ public:
|
||||
*
|
||||
* Deprecated - please use nameForVariant
|
||||
*/
|
||||
std::string name() const;
|
||||
SG_DEPRECATED(std::string name() const);
|
||||
|
||||
/**
|
||||
* Human readable name of a variant
|
||||
@ -117,7 +117,7 @@ public:
|
||||
* Deprecated - please use getLocalisedProp to get the variant-specific
|
||||
* description.
|
||||
*/
|
||||
std::string description() const;
|
||||
SG_DEPRECATED(std::string description() const);
|
||||
|
||||
/**
|
||||
* access the raw property data in the package
|
||||
@ -241,4 +241,3 @@ private:
|
||||
} // of namespace simgear
|
||||
|
||||
#endif // of SG_PACKAGE_PACKAGE_HXX
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user