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

Unified Diff: include/AdblockPlus/FileSystem.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 | « include/AdblockPlus/DefaultFileSystem.h ('k') | include/AdblockPlus/FilterEngine.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: include/AdblockPlus/FileSystem.h
diff --git a/include/AdblockPlus/FileSystem.h b/include/AdblockPlus/FileSystem.h
index 9d337a62f39b644582db26575b11d81f02a38dd1..c46e85cee2c33015ed6aad9948ae7e3506e7c503 100644
--- a/include/AdblockPlus/FileSystem.h
+++ b/include/AdblockPlus/FileSystem.h
@@ -21,8 +21,7 @@
#include <istream>
#include <stdint.h>
#include <string>
-
-#include "tr1_memory.h"
+#include <memory>
namespace AdblockPlus
{
@@ -73,7 +72,7 @@ namespace AdblockPlus
* @param path File path.
* @return Input stream with the file's contents.
*/
- virtual std::tr1::shared_ptr<std::istream>
+ virtual std::shared_ptr<std::istream>
Read(const std::string& path) const = 0;
/**
@@ -82,7 +81,7 @@ namespace AdblockPlus
* @param data Input stream with the data to write.
*/
virtual void Write(const std::string& path,
- std::tr1::shared_ptr<std::istream> data) = 0;
+ std::shared_ptr<std::istream> data) = 0;
/**
* Moves a file (i.e.\ renames it).
@@ -116,7 +115,7 @@ namespace AdblockPlus
/**
* Shared smart pointer to a `FileSystem` instance.
*/
- typedef std::tr1::shared_ptr<FileSystem> FileSystemPtr;
+ typedef std::shared_ptr<FileSystem> FileSystemPtr;
}
#endif
« no previous file with comments | « include/AdblockPlus/DefaultFileSystem.h ('k') | include/AdblockPlus/FilterEngine.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld