From X512 <danger_mail@xxxxxxx>:
X512 has uploaded this change for review. (
https://review.haiku-os.org/c/haiku/+/3457 ;)
Change subject: fix build after MethodDeleter interface change
......................................................................
fix build after MethodDeleter interface change
Change-Id: Iadb9e37772fd6588636085944c1455249ac0f926
---
M src/add-ons/kernel/file_systems/ext2/kernel_interface.cpp
M src/add-ons/kernel/file_systems/packagefs/package/PackageFile.cpp
M src/system/kernel/device_manager/device_manager.cpp
M src/system/kernel/vm/vm_page.cpp
M src/system/libroot/os/find_paths.cpp
5 files changed, 13 insertions(+), 16 deletions(-)
git pull ssh://git.haiku-os.org:22/haiku refs/changes/57/3457/1
diff --git a/src/add-ons/kernel/file_systems/ext2/kernel_interface.cpp
b/src/add-ons/kernel/file_systems/ext2/kernel_interface.cpp
index 942cb5f..7f3b139 100644
--- a/src/add-ons/kernel/file_systems/ext2/kernel_interface.cpp
+++ b/src/add-ons/kernel/file_systems/ext2/kernel_interface.cpp
@@ -1190,7 +1190,7 @@
cookie->last_size = inode->Size();
cookie->last_notification = system_time();
- MethodDeleter<Inode, status_t>
fileCacheEnabler(&Inode::EnableFileCache);
+ MethodDeleter<Inode, status_t, &Inode::EnableFileCache>
fileCacheEnabler;
if ((openMode & O_NOCACHE) != 0) {
status = inode->DisableFileCache();
if (status != B_OK)
diff --git a/src/add-ons/kernel/file_systems/packagefs/package/PackageFile.cpp
b/src/add-ons/kernel/file_systems/packagefs/package/PackageFile.cpp
index 477c955..62aed47 100644
--- a/src/add-ons/kernel/file_systems/packagefs/package/PackageFile.cpp
+++ b/src/add-ons/kernel/file_systems/packagefs/package/PackageFile.cpp
@@ -148,8 +148,8 @@
status_t error = PackageNode::VFSInit(deviceID, nodeID);
if (error != B_OK)
return error;
- MethodDeleter<PackageNode> baseClassUninit(this,
- &PackageNode::NonVirtualVFSUninit);
+ MethodDeleter<PackageNode, void, &PackageNode::NonVirtualVFSUninit>
+ baseClassUninit(this);
// open the package -- that's already done by PackageNode::VFSInit(),
so it
// shouldn't fail here. We only need to do it again, since we need the
FD.
diff --git a/src/system/kernel/device_manager/device_manager.cpp
b/src/system/kernel/device_manager/device_manager.cpp
index 00d035a..e8bb4c2 100644
--- a/src/system/kernel/device_manager/device_manager.cpp
+++ b/src/system/kernel/device_manager/device_manager.cpp
@@ -1955,8 +1955,7 @@
if (status < B_OK)
return status;
- MethodDeleter<device_node, bool> uninit(this,
- &device_node::UninitDriver);
+ MethodDeleter<device_node, bool, &device_node::UninitDriver>
uninit(this);
if ((fFlags & B_FIND_CHILD_ON_DEMAND) != 0) {
bool matches = false;
@@ -2026,8 +2025,7 @@
if (status < B_OK)
return status;
- MethodDeleter<device_node, bool> uninit(this,
- &device_node::UninitDriver);
+ MethodDeleter<device_node, bool, &device_node::UninitDriver>
uninit(this);
// If this child has been probed already, probe it again
status = _Probe();
@@ -2054,8 +2052,7 @@
if (status < B_OK)
return status;
- MethodDeleter<device_node, bool> uninit(this,
- &device_node::UninitDriver);
+ MethodDeleter<device_node, bool, &device_node::UninitDriver>
uninit(this);
if (DriverModule()->rescan_child_devices != NULL) {
status = DriverModule()->rescan_child_devices(DriverData());
diff --git a/src/system/kernel/vm/vm_page.cpp b/src/system/kernel/vm/vm_page.cpp
index 2b52b4a..182f791 100644
--- a/src/system/kernel/vm/vm_page.cpp
+++ b/src/system/kernel/vm/vm_page.cpp
@@ -2537,7 +2537,7 @@
VMCache* cache = page->Cache();
AutoLocker<VMCache> cacheLocker(cache, true);
- MethodDeleter<VMCache> _2(cache, &VMCache::ReleaseRefLocked);
+ MethodDeleter<VMCache, void, &VMCache::ReleaseRefLocked> _2(cache);
// check again if that page is still a candidate
if (page->busy || page->State() != PAGE_STATE_CACHED)
diff --git a/src/system/libroot/os/find_paths.cpp
b/src/system/libroot/os/find_paths.cpp
index 2660cd1..6d613e4 100644
--- a/src/system/libroot/os/find_paths.cpp
+++ b/src/system/libroot/os/find_paths.cpp
@@ -557,8 +557,8 @@
// get the installation location
InstallationLocations* installationLocations =
InstallationLocations::Get();
- MethodDeleter<InstallationLocations> installationLocationsDeleter(
- installationLocations, &InstallationLocations::Put);
+ MethodDeleter<InstallationLocations, void, &InstallationLocations::Put>
+ installationLocationsDeleter(installationLocations);
size_t installationLocationIndex;
const char* installationLocation = installationLocations->LocationFor(
@@ -678,8 +678,8 @@
// get the installation locations
InstallationLocations* installationLocations =
InstallationLocations::Get();
- MethodDeleter<InstallationLocations> installationLocationsDeleter(
- installationLocations, &InstallationLocations::Put);
+ MethodDeleter<InstallationLocations, void, &InstallationLocations::Put>
+ installationLocationsDeleter(installationLocations);
// Get the relative paths and compute the total size to allocate.
const char* relativePaths[InstallationLocations::kCount];
@@ -756,8 +756,8 @@
// get an installation location relative path
InstallationLocations* installationLocations =
InstallationLocations::Get();
- MethodDeleter<InstallationLocations> installationLocationsDeleter(
- installationLocations, &InstallationLocations::Put);
+ MethodDeleter<InstallationLocations, void, &InstallationLocations::Put>
+ installationLocationsDeleter(installationLocations);
size_t installationLocationIndex;
const char* installationLocation = installationLocations->LocationFor(
--
To view, visit https://review.haiku-os.org/c/haiku/+/3457
To unsubscribe, or for help writing mail filters, visit
https://review.haiku-os.org/settings
Gerrit-Project: haiku
Gerrit-Branch: master
Gerrit-Change-Id: Iadb9e37772fd6588636085944c1455249ac0f926
Gerrit-Change-Number: 3457
Gerrit-PatchSet: 1
Gerrit-Owner: X512 <danger_mail@xxxxxxx>
Gerrit-MessageType: newchange
