i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix build after MethodDeleter interface change

Browse Source 
Change-Id: Iadb9e37772fd6588636085944c1455249ac0f926
Reviewed-on: https://review.haiku-os.org/c/haiku/+/3457
Reviewed-by: Adrien Destugues <[email protected]>
This commit is contained in:
X512
2020-12-10 11:39:49 +00:00
committed by Adrien Destugues
parent aecba91311
commit ab57ee42cb
5 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/file_systems/ext2/kernel_interface.cpp
+1 -1
View File
@@ -1190,7 +1190,7 @@ ext2_open(fs_volume* _volume, fs_vnode* _node, int openMode, void** _cookie)
cookie->last_size = inode->Size(); cookie->last_size = inode->Size();
cookie->last_notification = system_time(); cookie->last_notification = system_time();
MethodDeleter<Inode, status_t> fileCacheEnabler(&Inode::EnableFileCache); MethodDeleter<Inode, status_t, &Inode::EnableFileCache> fileCacheEnabler;
if ((openMode & O_NOCACHE) != 0) { if ((openMode & O_NOCACHE) != 0) {
status = inode->DisableFileCache(); status = inode->DisableFileCache();
if (status != B_OK) if (status != B_OK)
src/add-ons/kernel/file_systems/packagefs/package/PackageFile.cpp
+2 -2
View File
@@ -148,8 +148,8 @@ PackageFile::VFSInit(dev_t deviceID, ino_t nodeID)
status_t error = PackageNode::VFSInit(deviceID, nodeID); status_t error = PackageNode::VFSInit(deviceID, nodeID);
if (error != B_OK) if (error != B_OK)
return error; return error;
MethodDeleter<PackageNode> baseClassUninit(this, MethodDeleter<PackageNode, void, &PackageNode::NonVirtualVFSUninit>
&PackageNode::NonVirtualVFSUninit); baseClassUninit(this);
// open the package -- that's already done by PackageNode::VFSInit(), so it // 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. // shouldn't fail here. We only need to do it again, since we need the FD.
src/system/kernel/device_manager/device_manager.cpp
+3 -6
View File
@@ -1955,8 +1955,7 @@ device_node::Probe(const char* devicePath, uint32 updateCycle)
if (status < B_OK) if (status < B_OK)
return status; return status;
MethodDeleter<device_node, bool> uninit(this, MethodDeleter<device_node, bool, &device_node::UninitDriver> uninit(this);
&device_node::UninitDriver);
if ((fFlags & B_FIND_CHILD_ON_DEMAND) != 0) { if ((fFlags & B_FIND_CHILD_ON_DEMAND) != 0) {
bool matches = false; bool matches = false;
@@ -2026,8 +2025,7 @@ device_node::Reprobe()
if (status < B_OK) if (status < B_OK)
return status; return status;
MethodDeleter<device_node, bool> uninit(this, MethodDeleter<device_node, bool, &device_node::UninitDriver> uninit(this);
&device_node::UninitDriver);
// If this child has been probed already, probe it again // If this child has been probed already, probe it again
status = _Probe(); status = _Probe();
@@ -2054,8 +2052,7 @@ device_node::Rescan()
if (status < B_OK) if (status < B_OK)
return status; return status;
MethodDeleter<device_node, bool> uninit(this, MethodDeleter<device_node, bool, &device_node::UninitDriver> uninit(this);
&device_node::UninitDriver);
if (DriverModule()->rescan_child_devices != NULL) { if (DriverModule()->rescan_child_devices != NULL) {
status = DriverModule()->rescan_child_devices(DriverData()); status = DriverModule()->rescan_child_devices(DriverData());
src/system/kernel/vm/vm_page.cpp
+1 -1
View File
@@ -2537,7 +2537,7 @@ free_cached_page(vm_page *page, bool dontWait)
VMCache* cache = page->Cache(); VMCache* cache = page->Cache();
AutoLocker<VMCache> cacheLocker(cache, true); 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 // check again if that page is still a candidate
if (page->busy || page->State() != PAGE_STATE_CACHED) if (page->busy || page->State() != PAGE_STATE_CACHED)
src/system/libroot/os/find_paths.cpp
+6 -6
View File
@@ -557,8 +557,8 @@ internal_path_for_path(char* referencePath, size_t referencePathSize,
// get the installation location // get the installation location
InstallationLocations* installationLocations = InstallationLocations::Get(); InstallationLocations* installationLocations = InstallationLocations::Get();
MethodDeleter<InstallationLocations> installationLocationsDeleter( MethodDeleter<InstallationLocations, void, &InstallationLocations::Put>
installationLocations, &InstallationLocations::Put); installationLocationsDeleter(installationLocations);
size_t installationLocationIndex; size_t installationLocationIndex;
const char* installationLocation = installationLocations->LocationFor( const char* installationLocation = installationLocations->LocationFor(
@@ -678,8 +678,8 @@ __find_paths_etc(const char* architecture, path_base_directory baseDirectory,
// get the installation locations // get the installation locations
InstallationLocations* installationLocations = InstallationLocations::Get(); InstallationLocations* installationLocations = InstallationLocations::Get();
MethodDeleter<InstallationLocations> installationLocationsDeleter( MethodDeleter<InstallationLocations, void, &InstallationLocations::Put>
installationLocations, &InstallationLocations::Put); installationLocationsDeleter(installationLocations);
// Get the relative paths and compute the total size to allocate. // Get the relative paths and compute the total size to allocate.
const char* relativePaths[InstallationLocations::kCount]; const char* relativePaths[InstallationLocations::kCount];
@@ -756,8 +756,8 @@ __guess_secondary_architecture_from_path(const char* path,
// get an installation location relative path // get an installation location relative path
InstallationLocations* installationLocations = InstallationLocations::Get(); InstallationLocations* installationLocations = InstallationLocations::Get();
MethodDeleter<InstallationLocations> installationLocationsDeleter( MethodDeleter<InstallationLocations, void, &InstallationLocations::Put>
installationLocations, &InstallationLocations::Put); installationLocationsDeleter(installationLocations);
size_t installationLocationIndex; size_t installationLocationIndex;
const char* installationLocation = installationLocations->LocationFor( const char* installationLocation = installationLocations->LocationFor(