Merge branch 'dev' into groupadmins

This commit is contained in:
John Preston 2015-10-30 19:36:11 -04:00
commit f954e89434
1 changed files with 1 additions and 1 deletions

View File

@ -43,7 +43,7 @@ struct StorageImageLocation {
};
inline bool operator==(const StorageImageLocation &a, const StorageImageLocation &b) {
return !memcmp(&a, &b, sizeof(StorageImageLocation));
return (a.width == b.width) && (a.height == b.height) && (a.dc == b.dc) && (a.volume == b.volume) && (a.local == b.local) && (a.secret == b.secret);
}
inline bool operator!=(const StorageImageLocation &a, const StorageImageLocation &b) {
return !(a == b);