2008-02-08 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>

Removed "using namespace std;" from all sources. Appended std:: 
prefix to c++
	standard classes.
	Included string.h where mem* function are used.
This commit is contained in:
Tatsuhiro Tsujikawa 2008-02-08 15:53:45 +00:00
parent d82e183d34
commit 1b7c198289
801 changed files with 12024 additions and 8627 deletions

View file

@ -8,9 +8,10 @@
#include "Segment.h"
#include "Option.h"
#include "MockBtContext.h"
#include "FileEntry.h"
#include <cppunit/extensions/HelperMacros.h>
using namespace std;
namespace aria2 {
class SegmentManTest:public CppUnit::TestFixture {
@ -36,18 +37,18 @@ CPPUNIT_TEST_SUITE_REGISTRATION( SegmentManTest );
void SegmentManTest::testNullBitfield()
{
Option op;
SingleFileDownloadContextHandle dctx = new SingleFileDownloadContext(0, 0, "aria2.tar.bz2");
UnknownLengthPieceStorageHandle ps = new UnknownLengthPieceStorage(dctx, &op);
SharedHandle<SingleFileDownloadContext> dctx = new SingleFileDownloadContext(0, 0, "aria2.tar.bz2");
SharedHandle<UnknownLengthPieceStorage> ps = new UnknownLengthPieceStorage(dctx, &op);
SegmentMan segmentMan(&op, dctx, ps);
SegmentHandle segment = segmentMan.getSegment(1);
SharedHandle<Segment> segment = segmentMan.getSegment(1);
CPPUNIT_ASSERT(!segment.isNull());
CPPUNIT_ASSERT_EQUAL((int32_t)0, segment->getIndex());
CPPUNIT_ASSERT_EQUAL((int32_t)0, segment->getLength());
CPPUNIT_ASSERT_EQUAL((int32_t)0, segment->getSegmentLength());
CPPUNIT_ASSERT_EQUAL((int32_t)0, segment->getWrittenLength());
SegmentHandle segment2 = segmentMan.getSegment(2);
SharedHandle<Segment> segment2 = segmentMan.getSegment(2);
CPPUNIT_ASSERT(segment2.isNull());
segmentMan.cancelSegment(1);
@ -59,23 +60,23 @@ void SegmentManTest::testCompleteSegment()
Option op;
int32_t pieceLength = 1024*1024;
int64_t totalLength = 64*1024*1024;
MockBtContextHandle dctx = new MockBtContext();
SharedHandle<MockBtContext> dctx = new MockBtContext();
dctx->setPieceLength(pieceLength);
dctx->setTotalLength(totalLength);
dctx->setNumPieces((totalLength+pieceLength-1)/pieceLength);
DefaultPieceStorageHandle ps = new DefaultPieceStorage(dctx, &op);
SharedHandle<DefaultPieceStorage> ps = new DefaultPieceStorage(dctx, &op);
SegmentMan segmentMan(&op, dctx, ps);
CPPUNIT_ASSERT(!segmentMan.getSegment(1, 0).isNull());
SegmentHandle seg = segmentMan.getSegment(1, 1);
SharedHandle<Segment> seg = segmentMan.getSegment(1, 1);
CPPUNIT_ASSERT(!seg.isNull());
CPPUNIT_ASSERT(!segmentMan.getSegment(1, 2).isNull());
seg->updateWrittenLength(pieceLength);
segmentMan.completeSegment(1, seg);
Segments segments = segmentMan.getInFlightSegment(1);
std::deque<SharedHandle<Segment> > segments = segmentMan.getInFlightSegment(1);
CPPUNIT_ASSERT_EQUAL((size_t)2, segments.size());
CPPUNIT_ASSERT_EQUAL(0, segments[0]->getIndex());
CPPUNIT_ASSERT_EQUAL(2, segments[1]->getIndex());
@ -98,7 +99,7 @@ void SegmentManTest::testMarkPieceDone_usedSegment()
CPPUNIT_ASSERT(!segmentMan.hasSegment(i));
}
SegmentHandle segment = segmentMan.getSegment(0, 5);
SharedHandle<Segment> segment = segmentMan.getSegment(0, 5);
CPPUNIT_ASSERT(!segment.isNull());
CPPUNIT_ASSERT_EQUAL((int32_t)5, segment->index);
CPPUNIT_ASSERT_EQUAL(pieceLength, (int32_t) segment->length);
@ -106,3 +107,5 @@ void SegmentManTest::testMarkPieceDone_usedSegment()
CPPUNIT_ASSERT_EQUAL((int32_t)100, segment->writtenLength);
*/
}
} // namespace aria2