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

Unified Diff: test/UpdateCheck.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/Prefs.cpp ('k') | third_party/googletest.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: test/UpdateCheck.cpp
diff --git a/test/UpdateCheck.cpp b/test/UpdateCheck.cpp
index 7d3616d406ea04d269ef6185b8ec5886030afa03..a2ade037aa813ee28626840fb541108cc517646e 100644
--- a/test/UpdateCheck.cpp
+++ b/test/UpdateCheck.cpp
@@ -15,13 +15,13 @@
* along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <AdblockPlus/tr1_functional.h>
+#include <functional>
#include "BaseJsTest.h"
namespace
{
- typedef std::tr1::shared_ptr<AdblockPlus::FilterEngine> FilterEnginePtr;
+ typedef std::shared_ptr<AdblockPlus::FilterEngine> FilterEnginePtr;
void FindAndReplace(std::string& source, const std::string& find, const std::string& replace)
{
@@ -75,7 +75,7 @@ namespace
jsEngine->SetFileSystem(AdblockPlus::FileSystemPtr(new LazyFileSystem));
jsEngine->SetWebRequest(webRequestPtr);
jsEngine->SetEventCallback("updateAvailable",
- std::tr1::bind(&UpdateCheckTest::EventCallback, this, std::tr1::placeholders::_1));
+ std::bind(&UpdateCheckTest::EventCallback, this, std::placeholders::_1));
filterEngine.reset(new AdblockPlus::FilterEngine(jsEngine));
}
@@ -83,7 +83,7 @@ namespace
void ForceUpdateCheck()
{
filterEngine->ForceUpdateCheck(
- std::tr1::bind(&UpdateCheckTest::UpdateCallback, this, std::tr1::placeholders::_1));
+ std::bind(&UpdateCheckTest::UpdateCallback, this, std::placeholders::_1));
}
void EventCallback(AdblockPlus::JsValueList& params)
« no previous file with comments | « test/Prefs.cpp ('k') | third_party/googletest.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld