mirrors/aria2
1
0
Fork 0
mirror of https://github.com/aria2/aria2.git synced 2025-04-05 05:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity

Cleanup a2functional.h

Browse source 
Remove mem_fun_sh in favor of std::mem_fun. Remove unused functions.

Use std::mem_fn instead of mem_fun_sh
This commit is contained in:
Tatsuhiro Tsujikawa 2013-06-22 17:53:39 +09:00
parent 50dcd6394c
commit e791eb9ca3
12 changed files with 17 additions and 185 deletions
Download patch file Download diff file Expand all files Collapse all files

48
test/a2functionalTest.cc
View file

@ -11,42 +11,13 @@ namespace aria2 {
class a2functionalTest:public CppUnit::TestFixture {
CPPUNIT_TEST_SUITE(a2functionalTest);
CPPUNIT_TEST(testMemFunSh);
CPPUNIT_TEST(testAdopt2nd);
CPPUNIT_TEST(testStrjoin);
CPPUNIT_TEST(testLeastRecentAccess);
CPPUNIT_TEST_SUITE_END();
public:
void testMemFunSh();
void testAdopt2nd();
void testStrjoin();
void testLeastRecentAccess();
class Greeting {
public:
virtual ~Greeting() {}
virtual std::string sayGreeting() = 0;
virtual std::string sayGreetingConst() const = 0;
};
typedef std::shared_ptr<Greeting> GreetingHandle;
class JapaneseGreeting:public Greeting
{
virtual std::string sayGreeting()
{
return "HAROO WAARUDO";
}
virtual std::string sayGreetingConst() const
{
return "HAROO WAARUDO";
}
};
struct LastAccess {
time_t lastAccess_;
LastAccess(time_t lastAccess):lastAccess_(lastAccess) {}
@ -58,27 +29,8 @@ public:
};
};
CPPUNIT_TEST_SUITE_REGISTRATION(a2functionalTest);
void a2functionalTest::testMemFunSh()
{
GreetingHandle greeting(new JapaneseGreeting());
CPPUNIT_ASSERT_EQUAL(std::string("HAROO WAARUDO"), mem_fun_sh(&Greeting::sayGreeting)(greeting));
CPPUNIT_ASSERT_EQUAL(std::string("HAROO WAARUDO"), mem_fun_sh(&Greeting::sayGreetingConst)(greeting));
}
void a2functionalTest::testAdopt2nd()
{
GreetingHandle greeting(new JapaneseGreeting());
CPPUNIT_ASSERT_EQUAL(std::string("A Japanese said:HAROO WAARUDO"),
adopt2nd(std::plus<std::string>(), mem_fun_sh(&Greeting::sayGreeting))("A Japanese said:", greeting));
}
void a2functionalTest::testStrjoin()
{
std::vector<std::string> v;