From 6ed18b369bc38562c74af69c3350709eb1e6590f Mon Sep 17 00:00:00 2001 From: Stefano Ceccherini Date: Mon, 14 Jun 2004 08:46:38 +0000 Subject: [PATCH] Fixes the build with gcc 3.2.2 (still has many warnings, though) git-svn-id: file:///srv/svn/repos/haiku/trunk/current@7950 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kernel/core/disk_device_manager/KDiskDevice.cpp | 2 +- src/kernel/core/disk_device_manager/UserDataWriter.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/kernel/core/disk_device_manager/KDiskDevice.cpp b/src/kernel/core/disk_device_manager/KDiskDevice.cpp index ab447b80d7..977ece65cd 100644 --- a/src/kernel/core/disk_device_manager/KDiskDevice.cpp +++ b/src/kernel/core/disk_device_manager/KDiskDevice.cpp @@ -336,7 +336,7 @@ KDiskDevice::ShadowOwner() const void KDiskDevice::WriteUserData(UserDataWriter &writer, bool shadow) { - KPartition *partition = (shadow ? ShadowPartition() : this); + KPartition *partition = shadow ? ShadowPartition() : static_cast(this); if (!partition) partition = this; user_disk_device_data *data diff --git a/src/kernel/core/disk_device_manager/UserDataWriter.cpp b/src/kernel/core/disk_device_manager/UserDataWriter.cpp index 7e8d4f700e..9dd757ea45 100644 --- a/src/kernel/core/disk_device_manager/UserDataWriter.cpp +++ b/src/kernel/core/disk_device_manager/UserDataWriter.cpp @@ -68,7 +68,7 @@ UserDataWriter::Unset() // AllocateData void * -UserDataWriter::AllocateData(size_t size, size_t align = 1) +UserDataWriter::AllocateData(size_t size, size_t align) { // handles size == 0 gracefully // get a properly aligned offset