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

Delta Between Two Patch Sets: include/AdblockPlus/JsValue.h

Issue 5163715573841920: Issue 768 - Switch from TR1 to C++11 (Closed)
Left Patch Set: rebase Created Aug. 5, 2015, 10:38 a.m.
Right Patch Set: fix including of <memory> Created Aug. 7, 2015, 6:07 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « include/AdblockPlus/JsEngine.h ('k') | include/AdblockPlus/LogSystem.h » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 /* 1 /*
2 * This file is part of Adblock Plus <https://adblockplus.org/>, 2 * This file is part of Adblock Plus <https://adblockplus.org/>,
3 * Copyright (C) 2006-2015 Eyeo GmbH 3 * Copyright (C) 2006-2015 Eyeo GmbH
4 * 4 *
5 * Adblock Plus is free software: you can redistribute it and/or modify 5 * Adblock Plus is free software: you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License version 3 as 6 * it under the terms of the GNU General Public License version 3 as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
8 * 8 *
9 * Adblock Plus is distributed in the hope that it will be useful, 9 * Adblock Plus is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 * GNU General Public License for more details. 12 * GNU General Public License for more details.
13 * 13 *
14 * You should have received a copy of the GNU General Public License 14 * You should have received a copy of the GNU General Public License
15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. 15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>.
16 */ 16 */
17 17
18 #ifndef ADBLOCK_PLUS_JS_VALUE_H 18 #ifndef ADBLOCK_PLUS_JS_VALUE_H
19 #define ADBLOCK_PLUS_JS_VALUE_H 19 #define ADBLOCK_PLUS_JS_VALUE_H
20 20
21 #include <stdint.h> 21 #include <stdint.h>
22 #include <string> 22 #include <string>
23 #include <vector> 23 #include <vector>
24 #include <memory>
24 #include "V8ValueHolder.h" 25 #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.
25 26
26 namespace v8 27 namespace v8
27 { 28 {
28 class Value; 29 class Value;
29 template<class T> class Handle; 30 template<class T> class Handle;
30 template<class T> class Local; 31 template<class T> class Local;
31 } 32 }
32 33
33 namespace AdblockPlus 34 namespace AdblockPlus
34 { 35 {
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 JsValue(JsValuePtr value); 128 JsValue(JsValuePtr value);
128 JsEnginePtr jsEngine; 129 JsEnginePtr jsEngine;
129 private: 130 private:
130 JsValue(JsEnginePtr jsEngine, v8::Handle<v8::Value> value); 131 JsValue(JsEnginePtr jsEngine, v8::Handle<v8::Value> value);
131 void SetProperty(const std::string& name, v8::Handle<v8::Value> val); 132 void SetProperty(const std::string& name, v8::Handle<v8::Value> val);
132 V8ValueHolder<v8::Value> value; 133 V8ValueHolder<v8::Value> value;
133 }; 134 };
134 } 135 }
135 136
136 #endif 137 #endif
LEFTRIGHT

Powered by Google App Engine
This is Rietveld