Unified Diff: include/AdblockPlus/WebRequest.h
Issue 5163715573841920:
Issue 768 - Switch from TR1 to C++11 (Closed)
Patch Set:
Created July 11, 2014, 2:24 p.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« include/AdblockPlus/FilterEngine.h ('K')
|
« include/AdblockPlus/LogSystem.h ('k')
|
include/AdblockPlus/tr1_functional.h » ('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: include/AdblockPlus/WebRequest.h |
| =================================================================== |
| --- a/include/AdblockPlus/WebRequest.h |
| +++ b/include/AdblockPlus/WebRequest.h |
| @@ -13,22 +13,21 @@ |
| * |
| * 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_WEB_REQUEST_H |
| #define ADBLOCK_PLUS_WEB_REQUEST_H |
| +#include <memory> |
| #include <stdint.h> |
| #include <string> |
| #include <vector> |
| -#include "tr1_memory.h" |
| - |
| namespace AdblockPlus |
| { |
| typedef std::vector<std::pair<std::string, std::string> > HeaderList; |
| struct ServerResponse |
| { |
| #ifdef _WIN32 |
| __int64 status; |
| @@ -62,12 +61,12 @@ namespace AdblockPlus |
| NS_CUSTOM_ERROR_BASE = 0x80850000, |
| NS_ERROR_NOT_INITIALIZED = 0xc1f30001 |
| }; |
| virtual inline ~WebRequest() {}; |
| virtual ServerResponse GET(const std::string& url, const HeaderList& requestHeaders) const = 0; |
| }; |
| - typedef std::tr1::shared_ptr<WebRequest> WebRequestPtr; |
| + typedef std::shared_ptr<WebRequest> WebRequestPtr; |
| } |
| #endif |
« include/AdblockPlus/FilterEngine.h ('K')
|
« include/AdblockPlus/LogSystem.h ('k')
|
include/AdblockPlus/tr1_functional.h » ('j')
|
no next file with comments »
