From c277ab01e6bb0591059753bd3a99d6c43d60cc8d Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Wed, 26 Jan 2005 14:57:35 +0000 Subject: [PATCH] Make the compiler happy. Shadowing super class methods with different signature is a very annoying C++ feature. git-svn-id: file:///srv/svn/repos/haiku/trunk/current@11069 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/private/kernel/disk_device_manager/KDiskDevice.h | 2 ++ src/kernel/core/disk_device_manager/KDiskDevice.cpp | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/headers/private/kernel/disk_device_manager/KDiskDevice.h b/headers/private/kernel/disk_device_manager/KDiskDevice.h index b5ed7decf6..62f015a3a2 100644 --- a/headers/private/kernel/disk_device_manager/KDiskDevice.h +++ b/headers/private/kernel/disk_device_manager/KDiskDevice.h @@ -70,6 +70,8 @@ public: void SetShadowOwner(team_id team); team_id ShadowOwner() const; + virtual void WriteUserData(UserDataWriter &writer, + user_partition_data *data); void WriteUserData(UserDataWriter &writer, bool shadow); virtual void Dump(bool deep = true, int32 level = 0); diff --git a/src/kernel/core/disk_device_manager/KDiskDevice.cpp b/src/kernel/core/disk_device_manager/KDiskDevice.cpp index 154188f41d..90cda405a3 100644 --- a/src/kernel/core/disk_device_manager/KDiskDevice.cpp +++ b/src/kernel/core/disk_device_manager/KDiskDevice.cpp @@ -332,6 +332,13 @@ KDiskDevice::ShadowOwner() const return fShadowOwner; } +// WriteUserData +void +KDiskDevice::WriteUserData(UserDataWriter &writer, user_partition_data *data) +{ + return KPhysicalPartition::WriteUserData(writer, data); +} + // WriteUserData void KDiskDevice::WriteUserData(UserDataWriter &writer, bool shadow)