Unified Diff: test/Prefs.cpp
Issue 5163715573841920:
Issue 768 - Switch from TR1 to C++11 (Closed)
Patch Set: rebase
Created Aug. 5, 2015, 10:38 a.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« test/BaseJsTest.h ('K')
|
« test/Notification.cpp ('k')
|
test/UpdateCheck.cpp » ('j')
|
no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: test/Prefs.cpp |
| diff --git a/test/Prefs.cpp b/test/Prefs.cpp |
| index 9d469e7d1af77f1179f7b1b05193d8b0b534b5e8..7952351554ebb6fa1ba8cb794ec0cdc9de3dd2ab 100644 |
| --- a/test/Prefs.cpp |
| +++ b/test/Prefs.cpp |
| @@ -22,22 +22,22 @@ |
| namespace |
| { |
| - typedef std::tr1::shared_ptr<AdblockPlus::FilterEngine> FilterEnginePtr; |
| + typedef std::shared_ptr<AdblockPlus::FilterEngine> FilterEnginePtr; |
| class TestFileSystem : public LazyFileSystem |
| { |
| public: |
| std::string prefsContents; |
| - std::tr1::shared_ptr<std::istream> Read(const std::string& path) const |
| + std::shared_ptr<std::istream> Read(const std::string& path) const |
| { |
| if (path == "prefs.json" && !prefsContents.empty()) |
| - return std::tr1::shared_ptr<std::istream>(new std::istringstream(prefsContents)); |
| + return std::shared_ptr<std::istream>(new std::istringstream(prefsContents)); |
| return LazyFileSystem::Read(path); |
| } |
| - 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) |
| { |
| if (path == "prefs.json") |
| { |
« test/BaseJsTest.h ('K')
|
« test/Notification.cpp ('k')
|
test/UpdateCheck.cpp » ('j')
|
no next file with comments »
