diff options
author | Alex Zolotarev <deathbaba@gmail.com> | 2011-02-16 13:52:07 +0300 |
---|---|---|
committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 01:12:38 +0300 |
commit | d87fba4671b9b696c9700f32f70b5da09539940a (patch) | |
tree | 74990f19b34b6c473c25b1c9c0f7bea71a25f8dd /platform | |
parent | 08a1d43923c01025826904439cf68917afba24e7 (diff) |
Removed boost:: prefix for bind calls (sometimes bind from tr2 can be used)
Diffstat (limited to 'platform')
-rw-r--r-- | platform/platform.hpp | 4 | ||||
-rw-r--r-- | platform/platform_tests/download_test.cpp | 44 |
2 files changed, 24 insertions, 24 deletions
diff --git a/platform/platform.hpp b/platform/platform.hpp index ef753bb1d5..d98d7ead9a 100644 --- a/platform/platform.hpp +++ b/platform/platform.hpp @@ -28,10 +28,10 @@ public: /// Throws FileAbsentException /// @param[in] file just file name which we want to read - /// @param[out] fullPath fully resolved path including file name - /// @return false if file is absent + /// @return fullPath fully resolved path including file name virtual string ReadPathForFile(char const * file) const = 0; /// Throws FileAbsentException + /// @return fullPath fully resolved path including file name string ReadPathForFile(string const & file) const { return ReadPathForFile(file.c_str()); diff --git a/platform/platform_tests/download_test.cpp b/platform/platform_tests/download_test.cpp index 2b37092f68..3d0e77485a 100644 --- a/platform/platform_tests/download_test.cpp +++ b/platform/platform_tests/download_test.cpp @@ -96,8 +96,8 @@ UNIT_TEST(SingleDownload) FileWriter::DeleteFile(TEST_FILE_NAME1); gMgr.DownloadFile(TEST_FILE_URL1, TEST_FILE_NAME1, - boost::bind(&DlObserver<NUM>::OnDownloadFinished, &observer, _1, _2), - boost::bind(&DlObserver<NUM>::OnDownloadProgress, &observer, _1, _2)); + bind(&DlObserver<NUM>::OnDownloadFinished, &observer, _1, _2), + bind(&DlObserver<NUM>::OnDownloadProgress, &observer, _1, _2)); WAIT_FOR_ASYNC_DOWNLOAD; TEST_EQUAL( observer.m_result[0], EHttpDownloadOk, ("Do you have internet connection?") ); TEST( gPlatform.IsFileExists(TEST_FILE_NAME1), () ); @@ -113,14 +113,14 @@ UNIT_TEST(MultiDownload) FileWriter::DeleteFile(TEST_FILE_NAME2); FileWriter::DeleteFile(TEST_FILE_NAME3); gMgr.DownloadFile(TEST_FILE_URL1, TEST_FILE_NAME1, - boost::bind(&DlObserver<NUM>::OnDownloadFinished, &observer, _1, _2), - boost::bind(&DlObserver<NUM>::OnDownloadProgress, &observer, _1, _2)); + bind(&DlObserver<NUM>::OnDownloadFinished, &observer, _1, _2), + bind(&DlObserver<NUM>::OnDownloadProgress, &observer, _1, _2)); gMgr.DownloadFile(TEST_FILE_URL2, TEST_FILE_NAME2, - boost::bind(&DlObserver<NUM>::OnDownloadFinished, &observer, _1, _2), - boost::bind(&DlObserver<NUM>::OnDownloadProgress, &observer, _1, _2)); + bind(&DlObserver<NUM>::OnDownloadFinished, &observer, _1, _2), + bind(&DlObserver<NUM>::OnDownloadProgress, &observer, _1, _2)); gMgr.DownloadFile(TEST_FILE_URL3, TEST_FILE_NAME3, - boost::bind(&DlObserver<NUM>::OnDownloadFinished, &observer, _1, _2), - boost::bind(&DlObserver<NUM>::OnDownloadProgress, &observer, _1, _2)); + bind(&DlObserver<NUM>::OnDownloadFinished, &observer, _1, _2), + bind(&DlObserver<NUM>::OnDownloadProgress, &observer, _1, _2)); WAIT_FOR_ASYNC_DOWNLOAD; TEST_EQUAL( observer.m_result[0], EHttpDownloadOk, ("Do you have internet connection?") ); @@ -144,8 +144,8 @@ UNIT_TEST(InvalidUrl) observer.m_result[0] = EHttpDownloadOk; gMgr.DownloadFile(TEST_INVALID_URL, TEST_FILE_NAME1, - boost::bind(&DlObserver<NUM>::OnDownloadFinished, &observer, _1, _2), - boost::bind(&DlObserver<NUM>::OnDownloadProgress, &observer, _1, _2)); + bind(&DlObserver<NUM>::OnDownloadFinished, &observer, _1, _2), + bind(&DlObserver<NUM>::OnDownloadProgress, &observer, _1, _2)); WAIT_FOR_ASYNC_DOWNLOAD; TEST_EQUAL( observer.m_result[0], EHttpDownloadFailed, () ); @@ -184,8 +184,8 @@ UNIT_TEST(DownloadFileExists) } gMgr.DownloadFile(TEST_FILE_URL1, TEST_FILE_NAME1, - boost::bind(&DlObserver<NUM>::OnDownloadFinished, &observer, _1, _2), - boost::bind(&DlObserver<NUM>::OnDownloadProgress, &observer, _1, _2)); + bind(&DlObserver<NUM>::OnDownloadFinished, &observer, _1, _2), + bind(&DlObserver<NUM>::OnDownloadProgress, &observer, _1, _2)); WAIT_FOR_ASYNC_DOWNLOAD; TEST_EQUAL( observer.m_result[0], EHttpDownloadOk, () ); @@ -212,16 +212,16 @@ UNIT_TEST(DownloadResume) DlObserver<NUM> observer1; gMgr.DownloadFile(TEST_FILE_URL1, TEST_FILE_NAME1, - boost::bind(&DlObserver<NUM>::OnDownloadFinished, &observer1, _1, _2), - boost::bind(&DlObserver<NUM>::OnDownloadProgress, &observer1, _1, _2), + bind(&DlObserver<NUM>::OnDownloadFinished, &observer1, _1, _2), + bind(&DlObserver<NUM>::OnDownloadProgress, &observer1, _1, _2), false); WAIT_FOR_ASYNC_DOWNLOAD; TEST_EQUAL( observer1.m_result[0], EHttpDownloadOk, () ); DlObserver<NUM> observer2; gMgr.DownloadFile(TEST_FILE_URL1, TEST_FILE_NAME2, - boost::bind(&DlObserver<NUM>::OnDownloadFinished, &observer2, _1, _2), - boost::bind(&DlObserver<NUM>::OnDownloadProgress, &observer2, _1, _2), + bind(&DlObserver<NUM>::OnDownloadFinished, &observer2, _1, _2), + bind(&DlObserver<NUM>::OnDownloadProgress, &observer2, _1, _2), false); WAIT_FOR_ASYNC_DOWNLOAD; TEST_EQUAL( observer2.m_result[0], EHttpDownloadOk, () ); @@ -239,8 +239,8 @@ UNIT_TEST(DownloadResume) } DlObserver<NUM> observer3; gMgr.DownloadFile(TEST_FILE_URL1, TEST_FILE_NAME1, - boost::bind(&DlObserver<NUM>::OnDownloadFinished, &observer3, _1, _2), - boost::bind(&DlObserver<NUM>::OnDownloadProgress, &observer3, _1, _2), + bind(&DlObserver<NUM>::OnDownloadFinished, &observer3, _1, _2), + bind(&DlObserver<NUM>::OnDownloadProgress, &observer3, _1, _2), true); WAIT_FOR_ASYNC_DOWNLOAD; TEST_EQUAL( observer3.m_result[0], EHttpDownloadOk, () ); @@ -265,8 +265,8 @@ UNIT_TEST(DownloadAbsentFile) DlObserver<NUM> observer; gMgr.DownloadFile(TEST_ABSENT_FILE_URL, TEST_ABSENT_FILE_NAME, - boost::bind(&DlObserver<NUM>::OnDownloadFinished, &observer, _1, _2), - boost::bind(&DlObserver<NUM>::OnDownloadProgress, &observer, _1, _2)); + bind(&DlObserver<NUM>::OnDownloadFinished, &observer, _1, _2), + bind(&DlObserver<NUM>::OnDownloadProgress, &observer, _1, _2)); WAIT_FOR_ASYNC_DOWNLOAD; TEST_EQUAL( observer.m_result[0], EHttpDownloadFileNotFound, () ); @@ -287,8 +287,8 @@ UNIT_TEST(DownloadLockedFile) TEST( GetPlatform().IsFileExists(TEST_LOCKED_FILE_NAME), () ); gMgr.DownloadFile(TEST_LOCKED_FILE_URL, TEST_LOCKED_FILE_NAME, - boost::bind(&DlObserver<NUM>::OnDownloadFinished, &observer, _1, _2), - boost::bind(&DlObserver<NUM>::OnDownloadProgress, &observer, _1, _2)); + bind(&DlObserver<NUM>::OnDownloadFinished, &observer, _1, _2), + bind(&DlObserver<NUM>::OnDownloadProgress, &observer, _1, _2)); WAIT_FOR_ASYNC_DOWNLOAD; TEST_EQUAL( observer.m_result[0], EHttpDownloadFileIsLocked, () ); |