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

Unified Diff: test/BaseJsTest.h

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 | « src/JsEngine.cpp ('k') | test/ConsoleJsObject.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: test/BaseJsTest.h
diff --git a/test/BaseJsTest.h b/test/BaseJsTest.h
index 2e63c20999eed66418374b701e6439e167ba3680..1f66a5830a89cbfa65f9ffc3e18ca3c9fd3475ca 100644
--- a/test/BaseJsTest.h
+++ b/test/BaseJsTest.h
@@ -35,13 +35,12 @@ public:
class ThrowingFileSystem : public AdblockPlus::FileSystem
{
public:
- std::tr1::shared_ptr<std::istream> Read(const std::string& path) const
+ std::shared_ptr<std::istream> Read(const std::string& path) const
{
throw std::runtime_error("Not implemented");
}
- void Write(const std::string& path,
- std::tr1::shared_ptr<std::istream> content)
+ void Write(const std::string& path, std::shared_ptr<std::istream> content)
{
throw std::runtime_error("Not implemented");
}
@@ -80,18 +79,17 @@ public:
class LazyFileSystem : public AdblockPlus::FileSystem
{
public:
- std::tr1::shared_ptr<std::istream> Read(const std::string& path) const
+ std::shared_ptr<std::istream> Read(const std::string& path) const
{
std::string dummyData("");
if (path == "patterns.ini")
dummyData = "# Adblock Plus preferences\n[Subscription]\nurl=~fl~";
else if (path == "prefs.json")
dummyData = "{}";
- return std::tr1::shared_ptr<std::istream>(new std::istringstream(dummyData));
+ return std::shared_ptr<std::istream>(new std::istringstream(dummyData));
}
- void Write(const std::string& path,
- std::tr1::shared_ptr<std::istream> content)
+ void Write(const std::string& path, std::shared_ptr<std::istream> content)
{
}
« no previous file with comments | « src/JsEngine.cpp ('k') | test/ConsoleJsObject.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld