Unified Diff: src/Utils.h
Issue 29361562:
Issue 3594 - remove circular references JsEngine-JsValue-JsEngine (Closed)
Patch Set: temporary workaround for race condition
Created Dec. 1, 2016, 10:26 a.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« src/JsValue.cpp ('K')
|
« src/Thread.cpp ('k')
|
src/Utils.cpp » ('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: src/Utils.h |
| diff --git a/src/Utils.h b/src/Utils.h |
| index 4e366961aa9795ba1c754e95d723ce3f99101d0e..fc923d424b8de674c86d81198d47ccfdcd0c146c 100644 |
| --- a/src/Utils.h |
| +++ b/src/Utils.h |
| @@ -23,10 +23,12 @@ |
| #include <functional> |
| #include <istream> |
| #include <string> |
| +#include <memory> |
| #include <v8.h> |
| namespace AdblockPlus |
| { |
| + class JsEngine; |
| namespace Utils |
| { |
| std::string Slurp(std::istream& stream); |
| @@ -48,6 +50,7 @@ namespace AdblockPlus |
| std::string ToUtf8String(const std::wstring& str); |
| std::wstring CanonizeUrl(const std::wstring& url); |
| #endif |
| + std::shared_ptr<JsEngine> lockJsEngine(const std::weak_ptr<JsEngine>& jsEngine); |
| } |
| } |
« src/JsValue.cpp ('K')
|
« src/Thread.cpp ('k')
|
src/Utils.cpp » ('j')
|
no next file with comments »
