4 files changed, 15 insertions, 7 deletions
diff --git a/taglib/toolkit/taglib.h b/taglib/toolkit/taglib.h
index 6b029974..450d8a32 100644
--- a/taglib/toolkit/taglib.h
+++ b/taglib/toolkit/taglib.h
@@ -44,6 +44,14 @@
 #define TAGLIB_CONSTRUCT_BITSET(x) static_cast<unsigned long>(x)
 #endif
 
+#if __cplusplus >= 201402
+#define TAGLIB_DEPRECATED [[deprecated]]
+#elif defined(__GNUC__) || defined(__clang__)
+#define TAGLIB_DEPRECATED __attribute__((deprecated))
+#elif defined(_MSC_VER)
+#define TAGLIB_DEPRECATED __declspec(deprecated)
+#endif
+
 #include <string>
 
 //! A namespace for all TagLib related classes and functions
diff --git a/taglib/toolkit/tbytevector.h b/taglib/toolkit/tbytevector.h
index e1549bb9..41373c72 100644
--- a/taglib/toolkit/tbytevector.h
+++ b/taglib/toolkit/tbytevector.h
@@ -281,7 +281,7 @@ namespace TagLib {
      * \deprecated
      */
      // BIC: remove
-    bool isNull() const;
+    TAGLIB_DEPRECATED bool isNull() const;
 
     /*!
      * Returns true if the ByteVector is empty.
@@ -595,7 +595,7 @@ namespace TagLib {
      * \deprecated
      */
     // BIC: remove
-    static ByteVector null;
+    TAGLIB_DEPRECATED static ByteVector null;
 
     /*!
      * Returns a hex-encoded copy of the byte vector.
diff --git a/taglib/toolkit/tfile.h b/taglib/toolkit/tfile.h
index c9a9d37e..3b6ff621 100644
--- a/taglib/toolkit/tfile.h
+++ b/taglib/toolkit/tfile.h
@@ -264,14 +264,14 @@ namespace TagLib {
      *
      * \deprecated
      */
-    static bool isReadable(const char *file);
+    TAGLIB_DEPRECATED static bool isReadable(const char *file);
 
     /*!
      * Returns true if \a file can be opened for writing.
      *
      * \deprecated
      */
-    static bool isWritable(const char *name);
+    TAGLIB_DEPRECATED static bool isWritable(const char *name);
 
   protected:
     /*!
diff --git a/taglib/toolkit/tstring.h b/taglib/toolkit/tstring.h
index b1be04b8..7028aab2 100644
--- a/taglib/toolkit/tstring.h
+++ b/taglib/toolkit/tstring.h
@@ -340,7 +340,7 @@ namespace TagLib {
      * \deprecated
      */
      // BIC: remove
-    bool isNull() const;
+    TAGLIB_DEPRECATED bool isNull() const;
 
     /*!
      * Returns a ByteVector containing the string's data.  If \a t is Latin1 or
@@ -525,7 +525,7 @@ namespace TagLib {
      * \deprecated
      */
      // BIC: remove
-    static String null;
+    TAGLIB_DEPRECATED static String null;
 
   protected:
     /*!
@@ -541,7 +541,7 @@ namespace TagLib {
      * may lead to a linkage error.
      */
      // BIC: remove
-    static const Type WCharByteOrder;
+    TAGLIB_DEPRECATED static const Type WCharByteOrder;
 
     class StringPrivate;
     StringPrivate *d;