Annotate deprecated identifiers as such

diff --git a/source/collection.h b/source/collection.h
index 39e6f43b2b3674b12c9d96e4de64f1fc1a2d4e49..bc84d624b2948c4c9bb46eb1716581de22b8da62 100644 (file)
--- a/source/collection.h
+++ b/source/collection.h
@@ -1,6 +1,7 @@
 #ifndef MSP_DATAFILE_COLLECTION_H_
 #define MSP_DATAFILE_COLLECTION_H_
 
+#include <msp/core/attributes.h>
 #include <msp/core/maputils.h>
 #include <msp/core/refptr.h>
 #include "collectionsource.h"
@@ -260,7 +261,8 @@ public:
        IO::Seekable *open_raw(const std::string &) const;
 
 protected:
-       IO::Seekable *open_from_sources(const std::string &n) { return open_raw(n); }
+       // Deprecated.  Use open_raw instead.
+       DEPRECATED IO::Seekable *open_from_sources(const std::string &n) { return open_raw(n); }
 
 private:
        void gather_names_from_sources(std::list<std::string> &, const CollectionItemTypeBase &) const;

diff --git a/source/value.h b/source/value.h
index e2b9fb1c569782fcbc96dc9d687d9b48eb83388d..b7da1d7f3ff3668b0737f45440a19910076cda29 100644 (file)
--- a/source/value.h
+++ b/source/value.h
@@ -2,6 +2,7 @@
 #define MSP_DATAFILE_VALUE_H_
 
 #include <vector>
+#include <msp/core/attributes.h>
 #include <msp/core/meta.h>
 #include <msp/core/variant.h>
 #include "type.h"
@@ -34,7 +35,7 @@ private:
        T get_() const;
 };
 
-typedef std::vector<Value> ValueArray __attribute__((deprecated));
+typedef DEPRECATED std::vector<Value> ValueArray;
 
 template<typename T>
 inline T Value::get_() const