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

Side by Side 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.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
OLDNEW
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 "tr1_memory.h"
25 #include "V8ValueHolder.h" 24 #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.
26 25
27 namespace v8 26 namespace v8
28 { 27 {
29 class Value; 28 class Value;
30 template<class T> class Handle; 29 template<class T> class Handle;
31 template<class T> class Local; 30 template<class T> class Local;
32 } 31 }
33 32
34 namespace AdblockPlus 33 namespace AdblockPlus
35 { 34 {
36 class JsValue; 35 class JsValue;
37 class JsEngine; 36 class JsEngine;
38 37
39 typedef std::tr1::shared_ptr<JsEngine> JsEnginePtr; 38 typedef std::shared_ptr<JsEngine> JsEnginePtr;
40 39
41 /** 40 /**
42 * Shared smart pointer to a `JsValue` instance. 41 * Shared smart pointer to a `JsValue` instance.
43 */ 42 */
44 typedef std::tr1::shared_ptr<JsValue> JsValuePtr; 43 typedef std::shared_ptr<JsValue> JsValuePtr;
45 44
46 /** 45 /**
47 * List of JavaScript values. 46 * List of JavaScript values.
48 */ 47 */
49 typedef std::vector<AdblockPlus::JsValuePtr> JsValueList; 48 typedef std::vector<AdblockPlus::JsValuePtr> JsValueList;
50 49
51 /** 50 /**
52 * Wrapper for JavaScript values. 51 * Wrapper for JavaScript values.
53 * See `JsEngine` for creating `JsValue` objects. 52 * See `JsEngine` for creating `JsValue` objects.
54 */ 53 */
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 JsValue(JsValuePtr value); 127 JsValue(JsValuePtr value);
129 JsEnginePtr jsEngine; 128 JsEnginePtr jsEngine;
130 private: 129 private:
131 JsValue(JsEnginePtr jsEngine, v8::Handle<v8::Value> value); 130 JsValue(JsEnginePtr jsEngine, v8::Handle<v8::Value> value);
132 void SetProperty(const std::string& name, v8::Handle<v8::Value> val); 131 void SetProperty(const std::string& name, v8::Handle<v8::Value> val);
133 V8ValueHolder<v8::Value> value; 132 V8ValueHolder<v8::Value> value;
134 }; 133 };
135 } 134 }
136 135
137 #endif 136 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld