Unified Diff: include/AdblockPlus/JsValue.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/FilterEngine.h ('K')
|
« include/AdblockPlus/JsEngine.h ('k')
|
include/AdblockPlus/LogSystem.h » ('j')
|
include/AdblockPlus/Notification.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: include/AdblockPlus/JsValue.h |
| diff --git a/include/AdblockPlus/JsValue.h b/include/AdblockPlus/JsValue.h |
| index 44535f92711382aa905576c59a283a82e3e4c490..9c468f2f7b4c3affecf211bbaed3ddf26b7afa1d 100644 |
| --- a/include/AdblockPlus/JsValue.h |
| +++ b/include/AdblockPlus/JsValue.h |
| @@ -21,7 +21,6 @@ |
| #include <stdint.h> |
| #include <string> |
| #include <vector> |
| -#include "tr1_memory.h" |
| #include "V8ValueHolder.h" |
|
Wladimir Palant
2015/08/05 11:19:39
You are assuming that <vector> will include <memor
sergei
2015/08/06 07:35:30
<vector> does not include <memory>, it's included
Wladimir Palant
2015/08/06 12:24:54
So, will you do it? :)
sergei
2015/08/07 06:29:39
Sorry, overlooked.
|
| namespace v8 |
| @@ -36,12 +35,12 @@ namespace AdblockPlus |
| class JsValue; |
| class JsEngine; |
| - typedef std::tr1::shared_ptr<JsEngine> JsEnginePtr; |
| + typedef std::shared_ptr<JsEngine> JsEnginePtr; |
| /** |
| * Shared smart pointer to a `JsValue` instance. |
| */ |
| - typedef std::tr1::shared_ptr<JsValue> JsValuePtr; |
| + typedef std::shared_ptr<JsValue> JsValuePtr; |
| /** |
| * List of JavaScript values. |
