From d0ff798a583789a45e8dda68d56b99635576521d Mon Sep 17 00:00:00 2001 From: shatty Date: Mon, 22 Nov 2004 03:00:30 +0000 Subject: [PATCH] added casts for deleting void*, this should cause destructors to be invoked now git-svn-id: file:///srv/svn/repos/haiku/trunk/current@10149 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../kernel/partitioning_systems/session/session.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/add-ons/kernel/partitioning_systems/session/session.cpp b/src/add-ons/kernel/partitioning_systems/session/session.cpp index 719b530249..4d7fae1221 100644 --- a/src/add-ons/kernel/partitioning_systems/session/session.cpp +++ b/src/add-ons/kernel/partitioning_systems/session/session.cpp @@ -164,7 +164,7 @@ scan_partition(int fd, partition_data *partition, void *cookie) partition_data *child = create_child_partition(partition->id, i, -1); if (!child) { - PRINT(("Unable to create child at index %ld.\n", i)); + PRINT(("Unable to create child at index %d.\n", i)); // something went wrong error = B_ERROR; break; @@ -188,7 +188,7 @@ scan_partition(int fd, partition_data *partition, void *cookie) partition->content_cookie = NULL; for (int32 i = 0; i < partition->child_count; i++) { if (partition_data *child = get_child_partition(partition->id, i)) { - delete child->cookie; + delete static_cast(child->cookie); child->cookie = NULL; } } @@ -203,7 +203,7 @@ free_identify_partition_cookie(partition_data */*partition*/, void *cookie) { if (cookie) { DEBUG_INIT_ETC(NULL, ("cookie: %p", cookie)); - delete cookie; + delete static_cast(cookie); } } @@ -213,7 +213,7 @@ free_partition_cookie(partition_data *partition) { if (partition && partition->cookie) { DEBUG_INIT_ETC(NULL, ("partition->cookie: %p", partition->cookie)); - delete partition->cookie; + delete static_cast(partition->cookie); partition->cookie = NULL; } } @@ -224,7 +224,7 @@ free_partition_content_cookie(partition_data *partition) { if (partition && partition->content_cookie) { DEBUG_INIT_ETC(NULL, ("partition->content_cookie: %p", partition->content_cookie)); - delete partition->content_cookie; + delete static_cast(partition->content_cookie); partition->content_cookie = NULL; } }