From a7340a380164ac6e27a126fb4b1610d56ba3f3ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Walenciak?= Date: Sat, 2 Feb 2019 09:52:39 +0100 Subject: [PATCH] removinf usage of EXIV2_DEPRECATED macro It can expand to [[deprecated]] which cannot be combined with result of EXIV2API macro expansion: __attribute__(...) --- include/exiv2/asfvideo.hpp | 7 +++---- include/exiv2/basicio.hpp | 3 +-- include/exiv2/epsimage.hpp | 7 +++---- include/exiv2/matroskavideo.hpp | 9 ++++----- include/exiv2/quicktimevideo.hpp | 6 +++--- include/exiv2/riffvideo.hpp | 7 +++---- include/exiv2/ssh.hpp | 3 +-- include/exiv2/utilsvideo.hpp | 8 +++++--- src/utilsvideo.cpp | 3 +++ 9 files changed, 26 insertions(+), 27 deletions(-) diff --git a/include/exiv2/asfvideo.hpp b/include/exiv2/asfvideo.hpp index 947af441..b103c4d1 100644 --- a/include/exiv2/asfvideo.hpp +++ b/include/exiv2/asfvideo.hpp @@ -31,7 +31,6 @@ #include "exiv2lib_export.h" // included header files -#include "exiv2lib_compiler_detection.h" #include "image.hpp" namespace Exiv2 { @@ -47,7 +46,7 @@ namespace Exiv2 { /*! @brief Class to access ASF video files. */ - class EXIV2_DEPRECATED EXIV2API AsfVideo:public Image + class EXIV2LIB_DEPRECATED_EXPORT AsfVideo:public Image { public: //! @name Creators @@ -170,10 +169,10 @@ namespace Exiv2 { Caller owns the returned object and the auto-pointer ensures that it will be deleted. */ - EXIV2_DEPRECATED EXIV2API Image::AutoPtr newAsfInstance(BasicIo::AutoPtr io, bool create); + EXIV2LIB_DEPRECATED_EXPORT Image::AutoPtr newAsfInstance(BasicIo::AutoPtr io, bool create); //! Check if the file iIo is a Windows Asf Video. - EXIV2_DEPRECATED EXIV2API bool isAsfType(BasicIo& iIo, bool advance); + EXIV2LIB_DEPRECATED_EXPORT bool isAsfType(BasicIo& iIo, bool advance); } // namespace Exiv2 diff --git a/include/exiv2/basicio.hpp b/include/exiv2/basicio.hpp index 0c8d7d99..1cd98791 100644 --- a/include/exiv2/basicio.hpp +++ b/include/exiv2/basicio.hpp @@ -27,7 +27,6 @@ #include "exiv2lib_export.h" // included header files -#include "exiv2lib_compiler_detection.h" #include "types.hpp" // + standard includes @@ -1113,7 +1112,7 @@ namespace Exiv2 { @brief Provides the ssh read/write access and sftp read access for the RemoteIo. This class is based on libssh. */ - class EXIV2_DEPRECATED EXIV2API SshIo : public RemoteIo { + class EXIV2LIB_DEPRECATED_EXPORT SshIo : public RemoteIo { public: //! @name Creators //@{ diff --git a/include/exiv2/epsimage.hpp b/include/exiv2/epsimage.hpp index aeebb02e..9338f575 100644 --- a/include/exiv2/epsimage.hpp +++ b/include/exiv2/epsimage.hpp @@ -38,7 +38,6 @@ #include "exiv2lib_export.h" // included header files -#include "exiv2lib_compiler_detection.h" #include "image.hpp" // ***************************************************************************** @@ -57,7 +56,7 @@ namespace Exiv2 /*! @brief Class to access EPS images. */ - class EXIV2_DEPRECATED EXIV2API EpsImage : public Image { + class EXIV2LIB_DEPRECATED_EXPORT EpsImage : public Image { public: //! @name Creators //@{ @@ -115,10 +114,10 @@ namespace Exiv2 Caller owns the returned object and the auto-pointer ensures that it will be deleted. */ - EXIV2_DEPRECATED EXIV2API Image::AutoPtr newEpsInstance(BasicIo::AutoPtr io, bool create); + EXIV2LIB_DEPRECATED_EXPORT Image::AutoPtr newEpsInstance(BasicIo::AutoPtr io, bool create); //! Check if the file iIo is a EPS image. - EXIV2_DEPRECATED EXIV2API bool isEpsType(BasicIo& iIo, bool advance); + EXIV2LIB_DEPRECATED_EXPORT bool isEpsType(BasicIo& iIo, bool advance); } // namespace Exiv2 diff --git a/include/exiv2/matroskavideo.hpp b/include/exiv2/matroskavideo.hpp index 58cff8cc..fa6981de 100644 --- a/include/exiv2/matroskavideo.hpp +++ b/include/exiv2/matroskavideo.hpp @@ -31,7 +31,6 @@ #include "exiv2lib_export.h" // included header files -#include "exiv2lib_compiler_detection.h" #include "image.hpp" // ***************************************************************************** @@ -50,7 +49,7 @@ namespace Exiv2 { /*! @brief Helper structure for the Matroska tags lookup table. */ - struct EXIV2_DEPRECATED MatroskaTags { + struct EXIV2LIB_DEPRECATED MatroskaTags { uint64_t val_; //!< Tag value const char* label_; //!< Translation of the tag value @@ -61,7 +60,7 @@ namespace Exiv2 { /*! @brief Class to access Matroska video files. */ - class EXIV2_DEPRECATED EXIV2API MatroskaVideo : public Image { + class EXIV2LIB_DEPRECATED_EXPORT MatroskaVideo : public Image { public: //! @name Creators //@{ @@ -146,10 +145,10 @@ namespace Exiv2 { Caller owns the returned object and the auto-pointer ensures that it will be deleted. */ - EXIV2_DEPRECATED EXIV2API Image::AutoPtr newMkvInstance(BasicIo::AutoPtr io, bool create); + EXIV2LIB_DEPRECATED_EXPORT Image::AutoPtr newMkvInstance(BasicIo::AutoPtr io, bool create); //! Check if the file iIo is a Matroska Video. - EXIV2_DEPRECATED EXIV2API bool isMkvType(BasicIo& iIo, bool advance); + EXIV2LIB_DEPRECATED_EXPORT bool isMkvType(BasicIo& iIo, bool advance); } // namespace Exiv2 diff --git a/include/exiv2/quicktimevideo.hpp b/include/exiv2/quicktimevideo.hpp index 83c9c9bd..f9faf496 100644 --- a/include/exiv2/quicktimevideo.hpp +++ b/include/exiv2/quicktimevideo.hpp @@ -49,7 +49,7 @@ namespace Exiv2 { /*! @brief Class to access QuickTime video files. */ - class EXIV2_DEPRECATED EXIV2API QuickTimeVideo:public Image + class EXIV2LIB_DEPRECATED_EXPORT QuickTimeVideo:public Image { public: //! @name Creators @@ -242,10 +242,10 @@ namespace Exiv2 { Caller owns the returned object and the auto-pointer ensures that it will be deleted. */ - EXIV2_DEPRECATED EXIV2API Image::AutoPtr newQTimeInstance(BasicIo::AutoPtr io, bool create); + EXIV2LIB_DEPRECATED_EXPORT Image::AutoPtr newQTimeInstance(BasicIo::AutoPtr io, bool create); //! Check if the file iIo is a Quick Time Video. - EXIV2_DEPRECATED EXIV2API bool isQTimeType(BasicIo& iIo, bool advance); + EXIV2LIB_DEPRECATED_EXPORT bool isQTimeType(BasicIo& iIo, bool advance); } // namespace Exiv2 diff --git a/include/exiv2/riffvideo.hpp b/include/exiv2/riffvideo.hpp index a2295545..2568ed9e 100644 --- a/include/exiv2/riffvideo.hpp +++ b/include/exiv2/riffvideo.hpp @@ -32,7 +32,6 @@ // included header files #include "exif.hpp" -#include "exiv2lib_compiler_detection.h" #include "image.hpp" // ***************************************************************************** @@ -50,7 +49,7 @@ namespace Exiv2 { /*! @brief Class to access RIFF video files. */ - class EXIV2_DEPRECATED EXIV2API RiffVideo:public Image + class EXIV2LIB_DEPRECATED_EXPORT RiffVideo:public Image { public: //! @name Creators @@ -211,10 +210,10 @@ namespace Exiv2 { Caller owns the returned object and the auto-pointer ensures that it will be deleted. */ - EXIV2_DEPRECATED EXIV2API Image::AutoPtr newRiffInstance(BasicIo::AutoPtr io, bool create); + EXIV2LIB_DEPRECATED_EXPORT Image::AutoPtr newRiffInstance(BasicIo::AutoPtr io, bool create); //! Check if the file iIo is a Riff Video. - EXIV2_DEPRECATED EXIV2API bool isRiffType(BasicIo& iIo, bool advance); + EXIV2LIB_DEPRECATED_EXPORT bool isRiffType(BasicIo& iIo, bool advance); } // namespace Exiv2 diff --git a/include/exiv2/ssh.hpp b/include/exiv2/ssh.hpp index a5d2d213..ee9470dc 100644 --- a/include/exiv2/ssh.hpp +++ b/include/exiv2/ssh.hpp @@ -30,7 +30,6 @@ #include #include "error.hpp" -#include "exiv2lib_compiler_detection.h" #include "types.hpp" #include "futils.hpp" @@ -40,7 +39,7 @@ namespace Exiv2 { It makes the libssh transparent. The functions in this class can be used without the requirement of understanding libssh. */ - class EXIV2_DEPRECATED EXIV2API SSH { + class EXIV2LIB_DEPRECATED_EXPORT SSH { public: //! @name Creators //@{ diff --git a/include/exiv2/utilsvideo.hpp b/include/exiv2/utilsvideo.hpp index 60195b50..68c737f7 100644 --- a/include/exiv2/utilsvideo.hpp +++ b/include/exiv2/utilsvideo.hpp @@ -21,7 +21,9 @@ #ifndef UTILSVIDEO_HPP_ #define UTILSVIDEO_HPP_ -#include "exiv2lib_compiler_detection.h" +#include "exiv2lib_export.h" + +#include "exif.hpp" namespace Exiv2 { @@ -29,7 +31,7 @@ namespace Exiv2 /*! @brief Class of utility functions used by the video code. */ - class EXIV2_DEPRECATED UtilsVideo + class EXIV2LIB_DEPRECATED_EXPORT UtilsVideo { public: /*! @@ -61,4 +63,4 @@ namespace Exiv2 } // namespace Exiv2 -#endif // #ifndef UTILSVIDEO_HPP_ \ No newline at end of file +#endif // #ifndef UTILSVIDEO_HPP_ diff --git a/src/utilsvideo.cpp b/src/utilsvideo.cpp index 1ad01b50..2ebf70a2 100644 --- a/src/utilsvideo.cpp +++ b/src/utilsvideo.cpp @@ -25,6 +25,9 @@ @date 16-Aug-14, AB: created */ // ***************************************************************************** + +#include "config.h" + #ifdef EXV_ENABLE_VIDEO #include "utilsvideo.hpp"