Require -std=c++11 and use std::shared_ptr instead of SharedHandle

1 files changed, 57 insertions, 57 deletions

diff --git a/test/MultiDiskAdaptorTest.cc b/test/MultiDiskAdaptorTest.cc
index dac76832..8d66130c 100644
--- a/test/MultiDiskAdaptorTest.cc
+++ b/test/MultiDiskAdaptorTest.cc
@@ -28,7 +28,7 @@ class MultiDiskAdaptorTest:public CppUnit::TestFixture {
   CPPUNIT_TEST(testWriteCache);
   CPPUNIT_TEST_SUITE_END();
 private:
-  SharedHandle<MultiDiskAdaptor> adaptor;
+  std::shared_ptr<MultiDiskAdaptor> adaptor;
 public:
   void setUp() {
     adaptor.reset(new MultiDiskAdaptor());
@@ -47,17 +47,17 @@ public:
 
 CPPUNIT_TEST_SUITE_REGISTRATION( MultiDiskAdaptorTest );
 
-std::vector<SharedHandle<FileEntry> > createEntries() {
-  SharedHandle<FileEntry> array[] = {
-    SharedHandle<FileEntry>(new FileEntry(A2_TEST_OUT_DIR"/file0.txt", 0, 0)),
-    SharedHandle<FileEntry>(new FileEntry(A2_TEST_OUT_DIR"/file1.txt", 15, 0)),
-    SharedHandle<FileEntry>(new FileEntry(A2_TEST_OUT_DIR"/file2.txt", 7, 15)),
-    SharedHandle<FileEntry>(new FileEntry(A2_TEST_OUT_DIR"/file3.txt", 0, 22)),
-    SharedHandle<FileEntry>(new FileEntry(A2_TEST_OUT_DIR"/file4.txt", 2, 22)),
-    SharedHandle<FileEntry>(new FileEntry(A2_TEST_OUT_DIR"/file5.txt", 0, 24)),
-    SharedHandle<FileEntry>(new FileEntry(A2_TEST_OUT_DIR"/file6.txt", 3, 24)),
-    SharedHandle<FileEntry>(new FileEntry(A2_TEST_OUT_DIR"/file7.txt", 0, 27)),
-    SharedHandle<FileEntry>(new FileEntry(A2_TEST_OUT_DIR"/file8.txt", 2, 27)),
+std::vector<std::shared_ptr<FileEntry> > createEntries() {
+  std::shared_ptr<FileEntry> array[] = {
+    std::shared_ptr<FileEntry>(new FileEntry(A2_TEST_OUT_DIR"/file0.txt", 0, 0)),
+    std::shared_ptr<FileEntry>(new FileEntry(A2_TEST_OUT_DIR"/file1.txt", 15, 0)),
+    std::shared_ptr<FileEntry>(new FileEntry(A2_TEST_OUT_DIR"/file2.txt", 7, 15)),
+    std::shared_ptr<FileEntry>(new FileEntry(A2_TEST_OUT_DIR"/file3.txt", 0, 22)),
+    std::shared_ptr<FileEntry>(new FileEntry(A2_TEST_OUT_DIR"/file4.txt", 2, 22)),
+    std::shared_ptr<FileEntry>(new FileEntry(A2_TEST_OUT_DIR"/file5.txt", 0, 24)),
+    std::shared_ptr<FileEntry>(new FileEntry(A2_TEST_OUT_DIR"/file6.txt", 3, 24)),
+    std::shared_ptr<FileEntry>(new FileEntry(A2_TEST_OUT_DIR"/file7.txt", 0, 27)),
+    std::shared_ptr<FileEntry>(new FileEntry(A2_TEST_OUT_DIR"/file8.txt", 2, 27)),
   };
   //           1    1    2    2    3
   // 0....5....0....5....0....5....0
@@ -71,8 +71,8 @@ std::vector<SharedHandle<FileEntry> > createEntries() {
   //                         *** file6
   //                            |file7
   //                            ** file8
-  std::vector<SharedHandle<FileEntry> > entries(vbegin(array), vend(array));
-  for(std::vector<SharedHandle<FileEntry> >::const_iterator i = entries.begin();
+  std::vector<std::shared_ptr<FileEntry> > entries(vbegin(array), vend(array));
+  for(std::vector<std::shared_ptr<FileEntry> >::const_iterator i = entries.begin();
       i != entries.end(); ++i) {
     File((*i)->getPath()).remove();
   }
@@ -82,12 +82,12 @@ std::vector<SharedHandle<FileEntry> > createEntries() {
 void MultiDiskAdaptorTest::testResetDiskWriterEntries()
 {
   {
-    std::vector<SharedHandle<FileEntry> > fileEntries = createEntries();
+    std::vector<std::shared_ptr<FileEntry> > fileEntries = createEntries();
     adaptor->setFileEntries(fileEntries.begin(), fileEntries.end());
     // In openFile(), resetDiskWriterEntries() are called.
     adaptor->openFile();
 
-    std::vector<SharedHandle<DiskWriterEntry> > entries =
+    std::vector<std::shared_ptr<DiskWriterEntry> > entries =
       adaptor->getDiskWriterEntries();
     CPPUNIT_ASSERT(entries[0]->getDiskWriter());
     CPPUNIT_ASSERT(entries[1]->getDiskWriter());
@@ -99,13 +99,13 @@ void MultiDiskAdaptorTest::testResetDiskWriterEntries()
     adaptor->closeFile();
   }
   {
-    std::vector<SharedHandle<FileEntry> > fileEntries = createEntries();
+    std::vector<std::shared_ptr<FileEntry> > fileEntries = createEntries();
     fileEntries[0]->setRequested(false);
     adaptor->setFileEntries(fileEntries.begin(), fileEntries.end());
     // In openFile(), resetDiskWriterEntries() are called.
     adaptor->openFile();
 
-    std::vector<SharedHandle<DiskWriterEntry> > entries =
+    std::vector<std::shared_ptr<DiskWriterEntry> > entries =
       adaptor->getDiskWriterEntries();
     // Because entries[1] spans entries[0]
     CPPUNIT_ASSERT(entries[0]->getDiskWriter());
@@ -118,14 +118,14 @@ void MultiDiskAdaptorTest::testResetDiskWriterEntries()
     adaptor->closeFile();
   }
   {
-    std::vector<SharedHandle<FileEntry> > fileEntries = createEntries();
+    std::vector<std::shared_ptr<FileEntry> > fileEntries = createEntries();
     fileEntries[0]->setRequested(false);
     fileEntries[1]->setRequested(false);
     adaptor->setFileEntries(fileEntries.begin(), fileEntries.end());
     // In openFile(), resetDiskWriterEntries() are called.
     adaptor->openFile();
 
-    std::vector<SharedHandle<DiskWriterEntry> > entries =
+    std::vector<std::shared_ptr<DiskWriterEntry> > entries =
       adaptor->getDiskWriterEntries();
     CPPUNIT_ASSERT(!entries[0]->getDiskWriter());
     // Because entries[2] spans entries[1]
@@ -139,13 +139,13 @@ void MultiDiskAdaptorTest::testResetDiskWriterEntries()
     adaptor->closeFile();
   }
   {
-    std::vector<SharedHandle<FileEntry> > fileEntries = createEntries();
+    std::vector<std::shared_ptr<FileEntry> > fileEntries = createEntries();
     fileEntries[3]->setRequested(false);
     adaptor->setFileEntries(fileEntries.begin(), fileEntries.end());
     // In openFile(), resetDiskWriterEntries() are called.
     adaptor->openFile();
 
-    std::vector<SharedHandle<DiskWriterEntry> > entries =
+    std::vector<std::shared_ptr<DiskWriterEntry> > entries =
       adaptor->getDiskWriterEntries();
     CPPUNIT_ASSERT(entries[0]->getDiskWriter());
     CPPUNIT_ASSERT(entries[1]->getDiskWriter());
@@ -159,13 +159,13 @@ void MultiDiskAdaptorTest::testResetDiskWriterEntries()
     adaptor->closeFile();
   }
   {
-    std::vector<SharedHandle<FileEntry> > fileEntries = createEntries();
+    std::vector<std::shared_ptr<FileEntry> > fileEntries = createEntries();
     fileEntries[4]->setRequested(false);
     adaptor->setFileEntries(fileEntries.begin(), fileEntries.end());
     // In openFile(), resetDiskWriterEntries() are called.
     adaptor->openFile();
 
-    std::vector<SharedHandle<DiskWriterEntry> > entries =
+    std::vector<std::shared_ptr<DiskWriterEntry> > entries =
       adaptor->getDiskWriterEntries();
     CPPUNIT_ASSERT(entries[0]->getDiskWriter());
     CPPUNIT_ASSERT(entries[1]->getDiskWriter());
@@ -178,14 +178,14 @@ void MultiDiskAdaptorTest::testResetDiskWriterEntries()
     adaptor->closeFile();
   }
   {
-    std::vector<SharedHandle<FileEntry> > fileEntries = createEntries();
+    std::vector<std::shared_ptr<FileEntry> > fileEntries = createEntries();
     fileEntries[3]->setRequested(false);
     fileEntries[4]->setRequested(false);
     adaptor->setFileEntries(fileEntries.begin(), fileEntries.end());
     // In openFile(), resetDiskWriterEntries() are called.
     adaptor->openFile();
 
-    std::vector<SharedHandle<DiskWriterEntry> > entries =
+    std::vector<std::shared_ptr<DiskWriterEntry> > entries =
       adaptor->getDiskWriterEntries();
     CPPUNIT_ASSERT(entries[0]->getDiskWriter());
     CPPUNIT_ASSERT(entries[1]->getDiskWriter());
@@ -197,7 +197,7 @@ void MultiDiskAdaptorTest::testResetDiskWriterEntries()
     adaptor->closeFile();
   }
   {
-    std::vector<SharedHandle<FileEntry> > fileEntries = createEntries();
+    std::vector<std::shared_ptr<FileEntry> > fileEntries = createEntries();
     for(size_t i = 5; i < 9; ++i) {
       fileEntries[i]->setRequested(false);
     }
@@ -205,7 +205,7 @@ void MultiDiskAdaptorTest::testResetDiskWriterEntries()
     // In openFile(), resetDiskWriterEntries() are called.
     adaptor->openFile();
 
-    std::vector<SharedHandle<DiskWriterEntry> > entries =
+    std::vector<std::shared_ptr<DiskWriterEntry> > entries =
       adaptor->getDiskWriterEntries();
     CPPUNIT_ASSERT(entries[0]->getDiskWriter());
     CPPUNIT_ASSERT(entries[1]->getDiskWriter());
@@ -217,13 +217,13 @@ void MultiDiskAdaptorTest::testResetDiskWriterEntries()
     adaptor->closeFile();
   }
   {
-    std::vector<SharedHandle<FileEntry> > fileEntries = createEntries();
+    std::vector<std::shared_ptr<FileEntry> > fileEntries = createEntries();
     for(size_t i = 1; i < 9; ++i) {
       fileEntries[i]->setRequested(false);
     }
     adaptor->setFileEntries(fileEntries.begin(), fileEntries.end());
     adaptor->openFile();
-    std::vector<SharedHandle<DiskWriterEntry> > entries =
+    std::vector<std::shared_ptr<DiskWriterEntry> > entries =
       adaptor->getDiskWriterEntries();
     CPPUNIT_ASSERT(entries[0]->getDiskWriter());
     CPPUNIT_ASSERT(!entries[1]->getDiskWriter());
@@ -235,13 +235,13 @@ void MultiDiskAdaptorTest::testResetDiskWriterEntries()
     adaptor->closeFile();
   }
   {
-    std::vector<SharedHandle<FileEntry> > fileEntries = createEntries();
+    std::vector<std::shared_ptr<FileEntry> > fileEntries = createEntries();
     for(size_t i = 2; i < 9; ++i) {
       fileEntries[i]->setRequested(false);
     }
     adaptor->setFileEntries(fileEntries.begin(), fileEntries.end());
     adaptor->openFile();
-    std::vector<SharedHandle<DiskWriterEntry> > entries =
+    std::vector<std::shared_ptr<DiskWriterEntry> > entries =
       adaptor->getDiskWriterEntries();
     CPPUNIT_ASSERT(entries[0]->getDiskWriter());
     CPPUNIT_ASSERT(entries[1]->getDiskWriter());
@@ -255,14 +255,14 @@ void MultiDiskAdaptorTest::testResetDiskWriterEntries()
     adaptor->closeFile();
   }
   {
-    std::vector<SharedHandle<FileEntry> > fileEntries = createEntries();
+    std::vector<std::shared_ptr<FileEntry> > fileEntries = createEntries();
     for(size_t i = 0; i < 6; ++i) {
       fileEntries[i]->setRequested(false);
     }
     fileEntries[8]->setRequested(false);
     adaptor->setFileEntries(fileEntries.begin(), fileEntries.end());
     adaptor->openFile();
-    std::vector<SharedHandle<DiskWriterEntry> > entries =
+    std::vector<std::shared_ptr<DiskWriterEntry> > entries =
       adaptor->getDiskWriterEntries();
     CPPUNIT_ASSERT(!entries[0]->getDiskWriter());
     CPPUNIT_ASSERT(!entries[1]->getDiskWriter());
@@ -292,7 +292,7 @@ void readFile(const std::string& filename, char* buf, int bufLength) {
 }
 
 void MultiDiskAdaptorTest::testWriteData() {
-  std::vector<SharedHandle<FileEntry> > fileEntries(createEntries());
+  std::vector<std::shared_ptr<FileEntry> > fileEntries(createEntries());
   adaptor->setFileEntries(fileEntries.begin(), fileEntries.end());
 
   adaptor->openFile();
@@ -340,10 +340,10 @@ void MultiDiskAdaptorTest::testWriteData() {
 }
 
 void MultiDiskAdaptorTest::testReadData() {
-  SharedHandle<FileEntry> entry1(new FileEntry(A2_TEST_DIR"/file1r.txt", 15, 0));
-  SharedHandle<FileEntry> entry2(new FileEntry(A2_TEST_DIR"/file2r.txt", 7, 15));
-  SharedHandle<FileEntry> entry3(new FileEntry(A2_TEST_DIR"/file3r.txt", 3, 22));
-  std::vector<SharedHandle<FileEntry> > entries;
+  std::shared_ptr<FileEntry> entry1(new FileEntry(A2_TEST_DIR"/file1r.txt", 15, 0));
+  std::shared_ptr<FileEntry> entry2(new FileEntry(A2_TEST_DIR"/file2r.txt", 7, 15));
+  std::shared_ptr<FileEntry> entry3(new FileEntry(A2_TEST_DIR"/file3r.txt", 3, 22));
+  std::vector<std::shared_ptr<FileEntry> > entries;
   entries.push_back(entry1);
   entries.push_back(entry2);
   entries.push_back(entry3);
@@ -370,14 +370,14 @@ void MultiDiskAdaptorTest::testCutTrailingGarbage()
 {
   std::string dir = A2_TEST_OUT_DIR;
   std::string prefix = "aria2_MultiDiskAdaptorTest_testCutTrailingGarbage_";
-  SharedHandle<FileEntry> entries[] = {
-    SharedHandle<FileEntry>(new FileEntry(dir+"/"+prefix+"1", 256, 0)),
-    SharedHandle<FileEntry>(new FileEntry(dir+"/"+prefix+"2", 512, 256))
+  std::shared_ptr<FileEntry> entries[] = {
+    std::shared_ptr<FileEntry>(new FileEntry(dir+"/"+prefix+"1", 256, 0)),
+    std::shared_ptr<FileEntry>(new FileEntry(dir+"/"+prefix+"2", 512, 256))
   };
   for(size_t i = 0; i < A2_ARRAY_LEN(entries); ++i) {
     createFile(entries[i]->getPath(), entries[i]->getLength()+100);
   }
-  std::vector<SharedHandle<FileEntry> > fileEntries
+  std::vector<std::shared_ptr<FileEntry> > fileEntries
     (vbegin(entries), vend(entries));
 
   MultiDiskAdaptor adaptor;
@@ -399,14 +399,14 @@ void MultiDiskAdaptorTest::testSize()
 {
   std::string dir = A2_TEST_OUT_DIR;
   std::string prefix = "aria2_MultiDiskAdaptorTest_testSize_";
-  SharedHandle<FileEntry> entries[] = {
-    SharedHandle<FileEntry>(new FileEntry(dir+"/"+prefix+"1", 1, 0)),
-    SharedHandle<FileEntry>(new FileEntry(dir+"/"+prefix+"2", 1, 1))
+  std::shared_ptr<FileEntry> entries[] = {
+    std::shared_ptr<FileEntry>(new FileEntry(dir+"/"+prefix+"1", 1, 0)),
+    std::shared_ptr<FileEntry>(new FileEntry(dir+"/"+prefix+"2", 1, 1))
   };
   for(size_t i = 0; i < A2_ARRAY_LEN(entries); ++i) {
     createFile(entries[i]->getPath(), entries[i]->getLength());
   }
-  std::vector<SharedHandle<FileEntry> > fileEntries
+  std::vector<std::shared_ptr<FileEntry> > fileEntries
     (vbegin(entries), vend(entries));
 
   MultiDiskAdaptor adaptor;
@@ -422,11 +422,11 @@ void MultiDiskAdaptorTest::testSize()
 void MultiDiskAdaptorTest::testUtime()
 {
   std::string storeDir = A2_TEST_OUT_DIR"/aria2_MultiDiskAdaptorTest_testUtime";
-  SharedHandle<FileEntry> entries[] = {
-    SharedHandle<FileEntry>(new FileEntry(storeDir+"/requested", 0, 0)),
-    SharedHandle<FileEntry>(new FileEntry(storeDir+"/notFound", 0, 0)),
-    SharedHandle<FileEntry>(new FileEntry(storeDir+"/notRequested", 0, 0)),
-    SharedHandle<FileEntry>(new FileEntry(storeDir+"/anotherRequested", 0, 0)),
+  std::shared_ptr<FileEntry> entries[] = {
+    std::shared_ptr<FileEntry>(new FileEntry(storeDir+"/requested", 0, 0)),
+    std::shared_ptr<FileEntry>(new FileEntry(storeDir+"/notFound", 0, 0)),
+    std::shared_ptr<FileEntry>(new FileEntry(storeDir+"/notRequested", 0, 0)),
+    std::shared_ptr<FileEntry>(new FileEntry(storeDir+"/anotherRequested", 0, 0)),
   };
 
   createFile(entries[0]->getPath(), entries[0]->getLength());
@@ -436,7 +436,7 @@ void MultiDiskAdaptorTest::testUtime()
 
   entries[2]->setRequested(false);
 
-  std::vector<SharedHandle<FileEntry> > fileEntries
+  std::vector<std::shared_ptr<FileEntry> > fileEntries
     (vbegin(entries), vend(entries));
   MultiDiskAdaptor adaptor;
   adaptor.setFileEntries(fileEntries.begin(), fileEntries.end());
@@ -460,14 +460,14 @@ void MultiDiskAdaptorTest::testWriteCache()
 {
   std::string storeDir =
     A2_TEST_OUT_DIR"/aria2_MultiDiskAdaptorTest_testWriteCache";
-  SharedHandle<FileEntry> entries[] = {
-    SharedHandle<FileEntry>(new FileEntry(storeDir+"/file1", 16385, 0)),
-    SharedHandle<FileEntry>(new FileEntry(storeDir+"/file2", 4098, 16385))
+  std::shared_ptr<FileEntry> entries[] = {
+    std::shared_ptr<FileEntry>(new FileEntry(storeDir+"/file1", 16385, 0)),
+    std::shared_ptr<FileEntry>(new FileEntry(storeDir+"/file2", 4098, 16385))
   };
   for(int i = 0; i < 2; ++i) {
     File(entries[i]->getPath()).remove();
   }
-  SharedHandle<MultiDiskAdaptor> adaptor(new MultiDiskAdaptor());
+  std::shared_ptr<MultiDiskAdaptor> adaptor(new MultiDiskAdaptor());
   adaptor->setFileEntries(vbegin(entries), vend(entries));
   WrDiskCacheEntry cache(adaptor);
   std::string data1(16383, '1'), data2(100, '2'), data3(4000, '3');