Add operator!= to Inventory(List), make operator== a const method

minetest · Jan 11, 2014 · 51e6feb · 51e6feb
1 parent 84b94eb
commit 51e6feb
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/src/inventory.cpp b/src/inventory.cpp
@@ -562,7 +562,7 @@ InventoryList & InventoryList::operator = (const InventoryList &other)
 	return *this;
 }
 
-bool InventoryList::operator == (const InventoryList &other)
+bool InventoryList::operator == (const InventoryList &other) const
 {
 	if(m_size != other.m_size)
 		return false;
@@ -875,7 +875,7 @@ Inventory & Inventory::operator = (const Inventory &other)
 	return *this;
 }
 
-bool Inventory::operator == (const Inventory &other)
+bool Inventory::operator == (const Inventory &other) const
 {
 	if(m_lists.size() != other.m_lists.size())
 		return false;

diff --git a/src/inventory.h b/src/inventory.h
@@ -182,7 +182,11 @@ class InventoryList
 
 	InventoryList(const InventoryList &other);
 	InventoryList & operator = (const InventoryList &other);
-	bool operator == (const InventoryList &other);
+	bool operator == (const InventoryList &other) const;
+	bool operator != (const InventoryList &other) const
+	{
+		return !(*this == other);
+	}
 
 	const std::string &getName() const;
 	u32 getSize() const;
@@ -258,8 +262,12 @@ class Inventory
 	Inventory(IItemDefManager *itemdef);
 	Inventory(const Inventory &other);
 	Inventory & operator = (const Inventory &other);
-	bool operator == (const Inventory &other);
-
+	bool operator == (const Inventory &other) const;
+	bool operator != (const Inventory &other) const
+	{
+		return !(*this == other);
+	}
+
 	void serialize(std::ostream &os) const;
 	void deSerialize(std::istream &is);