From f0b58c6f2463da0b7f509a53d8054d5472504094 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Mon, 24 Aug 2015 11:53:30 +0200
Subject: db/UniqueTags, tag/Set, ...: use typedef tag_mask_t

---
 src/tag/Set.cxx | 12 ++++++------
 src/tag/Set.hxx |  8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/tag')

diff --git a/src/tag/Set.cxx b/src/tag/Set.cxx
index 30e4efe2d..6499321e6 100644
--- a/src/tag/Set.cxx
+++ b/src/tag/Set.cxx
@@ -58,16 +58,16 @@ CopyTagItem(TagBuilder &dest, const Tag &src, TagType type)
  * Copy all tag items of the types in the mask.
  */
 static void
-CopyTagMask(TagBuilder &dest, const Tag &src, uint32_t mask)
+CopyTagMask(TagBuilder &dest, const Tag &src, tag_mask_t mask)
 {
 	for (unsigned i = 0; i < TAG_NUM_OF_ITEM_TYPES; ++i)
-		if ((mask & (1u << i)) != 0)
+		if ((mask & (tag_mask_t(1) << i)) != 0)
 			CopyTagItem(dest, src, TagType(i));
 }
 
 void
 TagSet::InsertUnique(const Tag &src, TagType type, const char *value,
-		     uint32_t group_mask)
+		     tag_mask_t group_mask)
 {
 	TagBuilder builder;
 	if (value == nullptr)
@@ -85,7 +85,7 @@ TagSet::InsertUnique(const Tag &src, TagType type, const char *value,
 bool
 TagSet::CheckUnique(TagType dest_type,
 		    const Tag &tag, TagType src_type,
-		    uint32_t group_mask)
+		    tag_mask_t group_mask)
 {
 	bool found = false;
 
@@ -101,12 +101,12 @@ TagSet::CheckUnique(TagType dest_type,
 
 void
 TagSet::InsertUnique(const Tag &tag,
-		     TagType type, uint32_t group_mask)
+		     TagType type, tag_mask_t group_mask)
 {
 	static_assert(sizeof(group_mask) * 8 >= TAG_NUM_OF_ITEM_TYPES,
 		      "Mask is too small");
 
-	assert((group_mask & (1u << unsigned(type))) == 0);
+	assert((group_mask & (tag_mask_t(1) << unsigned(type))) == 0);
 
 	if (!CheckUnique(type, tag, type, group_mask) &&
 	    (type != TAG_ALBUM_ARTIST ||
diff --git a/src/tag/Set.hxx b/src/tag/Set.hxx
index aab994008..587b25a3a 100644
--- a/src/tag/Set.hxx
+++ b/src/tag/Set.hxx
@@ -22,11 +22,11 @@
 
 #include "Compiler.h"
 #include "Tag.hxx"
+#include "Mask.hxx"
 
 #include <set>
 
 #include <string.h>
-#include <stdint.h>
 
 /**
  * Helper class for #TagSet which compares two #Tag objects.
@@ -59,15 +59,15 @@ struct TagLess {
 class TagSet : public std::set<Tag, TagLess> {
 public:
 	void InsertUnique(const Tag &tag,
-			  TagType type, uint32_t group_mask);
+			  TagType type, tag_mask_t group_mask);
 
 private:
 	void InsertUnique(const Tag &src, TagType type, const char *value,
-			  uint32_t group_mask);
+			  tag_mask_t group_mask);
 
 	bool CheckUnique(TagType dest_type,
 			 const Tag &tag, TagType src_type,
-			 uint32_t group_mask);
+			 tag_mask_t group_mask);
 };
 
 #endif
-- 
cgit v1.2.3