Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Unified Diff: test/Notification.cpp

Issue 5163715573841920: Issue 768 - Switch from TR1 to C++11 (Closed)
Patch Set: fix including of <memory> Created Aug. 7, 2015, 6:07 a.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « test/FilterEngine.cpp ('k') | test/Prefs.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: test/Notification.cpp
diff --git a/test/Notification.cpp b/test/Notification.cpp
index d776a67cfa8965bca612b982e1543c8ae209e43c..148bf11c3ea28956e23bc1c378ae5f77fc611a5f 100644
--- a/test/Notification.cpp
+++ b/test/Notification.cpp
@@ -25,7 +25,7 @@ using namespace AdblockPlus;
namespace
{
- typedef std::tr1::shared_ptr<FilterEngine> FilterEnginePtr;
+ typedef std::shared_ptr<FilterEngine> FilterEnginePtr;
class NotificationTest : public BaseJsTest
{
@@ -51,9 +51,9 @@ namespace
NotificationPtr PeekNotification(const std::string& url = std::string())
{
NotificationPtr retValue;
- filterEngine->SetShowNotificationCallback(std::tr1::bind(
+ filterEngine->SetShowNotificationCallback(std::bind(
&NotificationTest::NotificationAvailableCallback,
- std::tr1::placeholders::_1, std::tr1::ref(retValue)));
+ std::placeholders::_1, std::ref(retValue)));
filterEngine->ShowNextNotification(url);
filterEngine->RemoveShowNotificationCallback();
return retValue;
@@ -100,7 +100,7 @@ namespace
BaseJsTest::SetUp();
isNotificationCallbackCalled = false;
jsEngine->SetFileSystem(
- std::tr1::shared_ptr<LazyFileSystem>(new LazyFileSystem()));
+ std::shared_ptr<LazyFileSystem>(new LazyFileSystem()));
const char* responseJsonText = "{"
"\"notifications\": [{"
"\"id\": \"some id\","
@@ -111,13 +111,13 @@ namespace
"\"title\": \"Title\""
"}]"
"}";
- jsEngine->SetWebRequest(std::tr1::shared_ptr<MockWebRequest>(
+ jsEngine->SetWebRequest(std::shared_ptr<MockWebRequest>(
new MockWebRequest(responseJsonText)));
jsEngine->SetLogSystem(LogSystemPtr(new DefaultLogSystem()));
filterEngine.reset(new FilterEngine(jsEngine));
filterEngine->SetShowNotificationCallback(
std::bind(&NotificationMockWebRequestTest::OnNotification,
- this, std::tr1::placeholders::_1));
+ this, std::placeholders::_1));
}
void OnNotification(const NotificationPtr& notification)
« no previous file with comments | « test/FilterEngine.cpp ('k') | test/Prefs.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld