diff options
| author | Ladislav <Zezula> | 2014-04-12 15:57:38 +0200 |
|---|---|---|
| committer | Ladislav <Zezula> | 2014-04-12 15:57:38 +0200 |
| commit | 5720c3b5b07479d89fbd9175bc4f323d49ff5ccd (patch) | |
| tree | 0ce2304b057a4db47621dd4a584c34d69b9991b4 | |
| parent | 9e154f9ba5a2c6775f27939960383618568aab92 (diff) | |
+ Removed deprecated stuff
| -rw-r--r-- | src/StormLib.h | 3 | ||||
| -rw-r--r-- | src/StormPort.h | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/StormLib.h b/src/StormLib.h index c37f789..3ff72e8 100644 --- a/src/StormLib.h +++ b/src/StormLib.h @@ -424,6 +424,8 @@ typedef enum _SFileInfoClass //----------------------------------------------------------------------------- // Deprecated flags. These are going to be removed in next releases. +/* + STORMLIB_DEPRECATED_FLAG(DWORD, STREAM_PROVIDER_LINEAR, STREAM_PROVIDER_FLAT); STORMLIB_DEPRECATED_FLAG(DWORD, STREAM_PROVIDER_ENCRYPTED, STREAM_PROVIDER_MPQE); STORMLIB_DEPRECATED_FLAG(DWORD, MPQ_OPEN_ENCRYPTED, STREAM_PROVIDER_MPQE); @@ -457,6 +459,7 @@ STORMLIB_DEPRECATED_FLAG(SFileInfoClass, SFILE_INFO_KEY, SFileInfoEncryptionKey) STORMLIB_DEPRECATED_FLAG(SFileInfoClass, SFILE_INFO_KEY_UNFIXED, SFileInfoEncryptionKeyRaw); STORMLIB_DEPRECATED_FLAG(SFileInfoClass, SFILE_INFO_FILETIME, SFileInfoFileTime); STORMLIB_DEPRECATED_FLAG(SFileInfoClass, SFILE_INFO_PATCH_CHAIN, SFileInfoPatchChain); +*/ //----------------------------------------------------------------------------- // Callback functions diff --git a/src/StormPort.h b/src/StormPort.h index 902b785..37fbad0 100644 --- a/src/StormPort.h +++ b/src/StormPort.h @@ -263,6 +263,7 @@ //----------------------------------------------------------------------------- // Macro for deprecated symbols +/* #ifdef _MSC_VER #if _MSC_FULL_VER >= 140050320 #define STORMLIB_DEPRECATED(_Text) __declspec(deprecated(_Text)) @@ -280,9 +281,10 @@ // When a flag is deprecated, use this macro #ifndef _STORMLIB_NO_DEPRECATE #define STORMLIB_DEPRECATED_FLAG(type, oldflag, newflag) \ - const STORMLIB_DEPRECATED(#oldflag " is deprecated. Use " #newflag ". To supress this warning, define _STORMLIB_NO_DEPRECATE") type oldflag = (type)newflag; + const STORMLIB_DEPRECATED(#oldflag " is deprecated. Use " #newflag ". To supress this warning, define _STORMLIB_NO_DEPRECATE") static type oldflag = (type)newflag; #else - #define STORMLIB_DEPRECATED_FLAG(type, oldflag, newflag) const type oldflag = (type)newflag; +#define STORMLIB_DEPRECATED_FLAG(type, oldflag, newflag) static type oldflag = (type)newflag; #endif +*/ #endif // __STORMPORT_H__ |