Issue 768 - Switch from TR1 to C++11

src/FilterEngine.cpp

Index: src/FilterEngine.cpp
===================================================================
--- a/src/FilterEngine.cpp
+++ b/src/FilterEngine.cpp
@@ -132,18 +132,18 @@ bool Subscription::IsUpdating()
 bool Subscription::operator==(const Subscription& subscription) const
 {
   return GetProperty("url")->AsString() == subscription.GetProperty("url")->AsString();
 }
 
 FilterEngine::FilterEngine(JsEnginePtr jsEngine)
     : jsEngine(jsEngine), initialized(false), firstRun(false), updateCheckId(0)
 {
-  jsEngine->SetEventCallback("init", std::tr1::bind(&FilterEngine::InitDone,
-      this, std::tr1::placeholders::_1));
+  jsEngine->SetEventCallback("init", std::bind(&FilterEngine::InitDone,
+      this, std::placeholders::_1));
 
   {
     // Lock the JS engine while we are loading scripts, no timeouts should fire
     // until we are done.
     const JsContext context(jsEngine);
     for (int i = 0; !jsSources[i].empty(); i += 2)
       jsEngine->Evaluate(jsSources[i + 1], jsSources[i]);
   }
@@ -295,18 +295,18 @@ std::string FilterEngine::GetHostFromURL
 }
 
 
 void FilterEngine::ForceUpdateCheck(FilterEngine::UpdaterCallback callback)
 {
   std::string eventName = "updateCheckDone";
   eventName += ++updateCheckId;
 
-  jsEngine->SetEventCallback(eventName, std::tr1::bind(&FilterEngine::UpdateCheckDone,
-      this, eventName, callback, std::tr1::placeholders::_1));
+  jsEngine->SetEventCallback(eventName, std::bind(&FilterEngine::UpdateCheckDone,
+      this, eventName, callback, std::placeholders::_1));
 
   JsValuePtr func = jsEngine->Evaluate("API.forceUpdateCheck");
   JsValueList params;
   params.push_back(jsEngine->NewValue(eventName));
   func->Call(params);
 }
 
 void FilterEngine::UpdateCheckDone(const std::string& eventName, FilterEngine::UpdaterCallback callback, JsValueList& params)
@@ -314,18 +314,18 @@ void FilterEngine::UpdateCheckDone(const
   jsEngine->RemoveEventCallback(eventName);
 
   std::string error(params.size() >= 1 && !params[0]->IsNull() ? params[0]->AsString() : "");
   callback(error);
 }
 
 void FilterEngine::SetFilterChangeCallback(FilterEngine::FilterChangeCallback callback)
 {
-  jsEngine->SetEventCallback("filterChange", std::tr1::bind(&FilterEngine::FilterChanged,
-      this, callback, std::tr1::placeholders::_1));
+  jsEngine->SetEventCallback("filterChange", std::bind(&FilterEngine::FilterChanged,
+      this, callback, std::placeholders::_1));
 }
 
 void FilterEngine::RemoveFilterChangeCallback()
 {
   jsEngine->RemoveEventCallback("filterChange");
 }
 
 void FilterEngine::FilterChanged(FilterEngine::FilterChangeCallback callback, JsValueList& params)