From a8a205c6a1780780ed7724cf1e401d94b23c898d Mon Sep 17 00:00:00 2001
From: Mikko Rasa <tdb@tdb.fi>
Date: Mon, 3 Jun 2019 14:54:16 +0300
Subject: [PATCH] Annotate deprecated identifiers as such

---
 source/collection.h | 4 +++-
 source/value.h      | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/source/collection.h b/source/collection.h
index 39e6f43..bc84d62 100644
--- 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 e2b9fb1..b7da1d7 100644
--- 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
-- 
2.43.0