hrev52865 adds 1 changeset to branch 'master'
old head: 279470d55308c1981e0264bf94a9c1b8dd6a29b5
new head: a0d1cbb95d47890de2f93906447025380927dabf
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=a0d1cbb95d47+%5E279470d55308
----------------------------------------------------------------------------
a0d1cbb95d47: Revert "netfs: Take advantage of HashKeyPointer."
This reverts commit 279470d55308c1981e0264bf94a9c1b8dd6a29b5.
Reason for revert: Commited in wrong order.
Change-Id: I1163b12728f19aee4506c95512d0afdea0433362
Reviewed-on: https://review.haiku-os.org/c/1046
Reviewed-by: Stephan Aßmus <superstippi@xxxxxx>
[ Stephan Aßmus <superstippi@xxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev52865
Commit: a0d1cbb95d47890de2f93906447025380927dabf
URL: https://git.haiku-os.org/haiku/commit/?id=a0d1cbb95d47
Author: Stephan Aßmus <superstippi@xxxxxx>
Date: Wed Feb 13 10:49:13 2019 UTC
----------------------------------------------------------------------------
1 file changed, 5 insertions(+), 1 deletion(-)
.../kernel/file_systems/netfs/server/SecurityContext.cpp | 6 +++++-
----------------------------------------------------------------------------
diff --git a/src/add-ons/kernel/file_systems/netfs/server/SecurityContext.cpp
b/src/add-ons/kernel/file_systems/netfs/server/SecurityContext.cpp
index 2ad19a4d02..df39137fda 100644
--- a/src/add-ons/kernel/file_systems/netfs/server/SecurityContext.cpp
+++ b/src/add-ons/kernel/file_systems/netfs/server/SecurityContext.cpp
@@ -525,7 +525,11 @@ SecurityContext::Archive(BMessage* archive, bool deep)
const
if (!tmpUserArchives)
return B_NO_MEMORY;
ArrayDeleter<BMessage> deleter(tmpUserArchives);
- HashMap<HashKeyPointer<User*>, BMessage*> userArchives;
+#ifdef B_HAIKU_64_BIT
+ HashMap<HashKey64<User*>, BMessage*> userArchives;
+#else
+ HashMap<HashKey32<User*>, BMessage*> userArchives;
+#endif
int32 i = 0;
for (UserMap::Iterator it = fUsers->GetIterator(); it.HasNext();) {
User* user = it.Next().value;
