Skip to content
Permalink
Browse files

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

  • Loading branch information
kahrl committed Jan 11, 2014
1 parent 84b94eb commit 51e6feb17c5929c60b5e8b87cb02c0d22ddb6ff5
Showing with 13 additions and 5 deletions.
  1. +2 −2 src/inventory.cpp
  2. +11 −3 src/inventory.h
@@ -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;
@@ -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);

0 comments on commit 51e6feb

Please sign in to comment.