Unified Diff: include/AdblockPlus/WebRequest.h
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.
« include/AdblockPlus/Notification.h ('K')
|
« include/AdblockPlus/Notification.h ('k')
|
include/AdblockPlus/tr1_functional.h » ('j')
|
src/DefaultFileSystem.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: include/AdblockPlus/WebRequest.h |
| diff --git a/include/AdblockPlus/WebRequest.h b/include/AdblockPlus/WebRequest.h |
| index f070a53ff19fde2f0c8ceeb68c00cffcf76ccfaf..1008484a03fee02a3a6f3312449769326126a31a 100644 |
| --- a/include/AdblockPlus/WebRequest.h |
| +++ b/include/AdblockPlus/WebRequest.h |
| @@ -18,12 +18,11 @@ |
| #ifndef ADBLOCK_PLUS_WEB_REQUEST_H |
| #define ADBLOCK_PLUS_WEB_REQUEST_H |
| +#include <memory> |
| #include <stdint.h> |
| #include <string> |
| #include <vector> |
| -#include "tr1_memory.h" |
| - |
| namespace AdblockPlus |
| { |
| /** |
| @@ -109,7 +108,7 @@ namespace AdblockPlus |
| /** |
| * Shared smart pointer to a `WebRequest` instance. |
| */ |
| - typedef std::tr1::shared_ptr<WebRequest> WebRequestPtr; |
| + typedef std::shared_ptr<WebRequest> WebRequestPtr; |
| } |
| #endif |
