| Index: include/AdblockPlus/FileSystem.h |
| =================================================================== |
| --- a/include/AdblockPlus/FileSystem.h |
| +++ b/include/AdblockPlus/FileSystem.h |
| @@ -14,21 +14,20 @@ |
| * You should have received a copy of the GNU General Public License |
| * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. |
| */ |
| #ifndef ADBLOCK_PLUS_FILE_SYSTEM_H |
| #define ADBLOCK_PLUS_FILE_SYSTEM_H |
| #include <istream> |
| +#include <memory> |
| #include <stdint.h> |
| #include <string> |
| -#include "tr1_memory.h" |
| - |
| namespace AdblockPlus |
| { |
| class FileSystem |
| { |
| public: |
| struct StatResult |
| { |
| StatResult() |
| @@ -41,23 +40,23 @@ namespace AdblockPlus |
| bool exists; |
| bool isDirectory; |
| bool isFile; |
| int64_t lastModified; |
| }; |
| virtual ~FileSystem() {} |
| - virtual std::tr1::shared_ptr<std::istream> |
| + virtual std::shared_ptr<std::istream> |
| Read(const std::string& path) const = 0; |
| virtual void Write(const std::string& path, |
| - std::tr1::shared_ptr<std::istream> data) = 0; |
| + std::shared_ptr<std::istream> data) = 0; |
| virtual void Move(const std::string& fromPath, |
| const std::string& toPath) = 0; |
| virtual void Remove(const std::string& path) = 0; |
| virtual StatResult Stat(const std::string& path) const = 0; |
| virtual std::string Resolve(const std::string& path) const = 0; |
| }; |
| - typedef std::tr1::shared_ptr<FileSystem> FileSystemPtr; |
| + typedef std::shared_ptr<FileSystem> FileSystemPtr; |
| } |
| #endif |