shared_ptr changes.

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

View File

@@ -17,17 +17,18 @@
#include <fuse/fuse_opt.h>
#include <fuse/fuse_lowlevel.h>
#include <Pascal/Pascal.h>
#include <ProFUSE/Exception.h>
#include <Device/BlockDevice.h>
#include <File/File.h>
#include <Device/Device.h>
#include <Device/BlockDevice.h>
std::string fDiskImage;
void usage()
{
std::printf("profuse_pascal 0.1\n\n");
@@ -196,9 +197,11 @@ int main(int argc, char **argv)
try
{
std::auto_ptr<Device::BlockDevice> device;
//std::tr1::shared_ptr<Device::BlockDevice> device;
device.reset( Device::BlockDevice::Open(fDiskImage.c_str(), File::ReadOnly, format) );
Device::BlockDevicePointer device;
device = Device::BlockDevice::Open(fDiskImage.c_str(), File::ReadOnly, format);
if (!device.get())
@@ -207,8 +210,8 @@ int main(int argc, char **argv)
exit(1);
}
volume.reset( new Pascal::VolumeEntry(device.get()) );
device.release();
volume.reset( new Pascal::VolumeEntry(device) );
device.reset();
}
catch (ProFUSE::POSIXException &e)
{