| Index: include/AdblockPlus/JsEngine.h |
| diff --git a/include/AdblockPlus/JsEngine.h b/include/AdblockPlus/JsEngine.h |
| index af168f1886a21cdbf8bfd1c6e87087f0372b9a75..bdea44394cec6d5af498afeccf2b021e79979163 100644 |
| --- a/include/AdblockPlus/JsEngine.h |
| +++ b/include/AdblockPlus/JsEngine.h |
| @@ -18,18 +18,17 @@ |
| #ifndef ADBLOCK_PLUS_JS_ENGINE_H |
| #define ADBLOCK_PLUS_JS_ENGINE_H |
| +#include <functional> |
| #include <map> |
| #include <stdexcept> |
| #include <stdint.h> |
| #include <string> |
| #include <AdblockPlus/AppInfo.h> |
| -#include <AdblockPlus/tr1_functional.h> |
| #include <AdblockPlus/LogSystem.h> |
| #include <AdblockPlus/FileSystem.h> |
| #include <AdblockPlus/JsValue.h> |
| #include <AdblockPlus/WebRequest.h> |
| -#include "tr1_memory.h" |
| #include "V8ValueHolder.h" |
| namespace v8 |
| @@ -49,12 +48,12 @@ namespace AdblockPlus |
| /** |
| * Shared smart pointer to a `JsEngine` instance. |
| */ |
| - typedef std::tr1::shared_ptr<JsEngine> JsEnginePtr; |
| + typedef std::shared_ptr<JsEngine> JsEnginePtr; |
| /** |
| * JavaScript engine used by `FilterEngine`, wraps v8. |
| */ |
| - class JsEngine : public std::tr1::enable_shared_from_this<JsEngine> |
| + class JsEngine : public std::enable_shared_from_this<JsEngine> |
| { |
| friend class JsValue; |
| friend class JsContext; |
| @@ -63,7 +62,7 @@ namespace AdblockPlus |
| /** |
| * Event callback function. |
| */ |
| - typedef std::tr1::function<void(JsValueList& params)> EventCallback; |
| + typedef std::function<void(JsValueList& params)> EventCallback; |
| /** |
| * Maps events to callback functions. |
| @@ -213,7 +212,7 @@ namespace AdblockPlus |
| /** |
| * Sets a global property that can be accessed by all the scripts. |
| - * @param name Name of the property to set. |
| + * @param name Name of the property to set. |
| * @param value Value of the property to set. |
| */ |
| void SetGlobalProperty(const std::string& name, AdblockPlus::JsValuePtr value); |