Apple-2-Tools/profuse
1
0
Fork 0
mirror of https://github.com/ksherlock/profuse.git synced 2026-03-13 08:41:50 +00:00
Code Issues Projects Releases Wiki Activity

shared_ptr changes.

Browse Source 
git-svn-id: https://profuse.googlecode.com/svn/branches/v2@346 aa027e90-d47c-11dd-86d7-074df07e0730
This commit is contained in:
ksherlock
2011-02-22 04:57:50 +00:00
parent 78d35bba08
commit 2243d8d136
19 changed files with 76 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Pascal/VolumeEntry.cpp
View File

@@ -71,12 +71,11 @@ VolumeEntry::VolumeEntry()
setInode(1);
_inodeGenerator = 1;
_cache = NULL;
_device = NULL;
_inodeGenerator = 1;
}
VolumeEntry::VolumeEntry(const char *name, Device::BlockDevice *device)
VolumeEntry::VolumeEntry(const char *name, Device::BlockDevicePointer device) :
_device(device)
{
#undef __METHOD__
#define __METHOD__ "VolumeEntry::VolumeEntry"
@@ -114,8 +113,8 @@ VolumeEntry::VolumeEntry(const char *name, Device::BlockDevice *device)
_accessTime = 0;
_lastBoot = Date::Today();
_cache = BlockCache::Create(device);
_device = device;
_cache = BlockCache::Create(device);
_address = 512 * 2;
@@ -136,10 +135,10 @@ VolumeEntry::VolumeEntry(const char *name, Device::BlockDevice *device)
}
VolumeEntry::VolumeEntry(Device::BlockDevice *device)
VolumeEntry::VolumeEntry(Device::BlockDevicePointer device)
{
unsigned blockCount;
unsigned deviceBlocks = device->blocks();
//unsigned deviceBlocks = device->blocks();
ProFUSE::auto_array<uint8_t> buffer(new uint8_t[512]);
@@ -245,10 +244,7 @@ VolumeEntry::~VolumeEntry()
{
if (*iter) delete *iter;
}
delete _cache;
// _device is deleted by _cache.
//delete _device;
}