Removing now deprecated non-standard tr1 namespace from IE driver

jimevans · jimevans · commit 982d79d15358 · 2018-02-02T11:48:53.000-08:00
diff --git a/cpp/iedriver/Alert.cpp b/cpp/iedriver/Alert.cpp
@@ -22,7 +22,7 @@
 
 namespace webdriver {
 
-Alert::Alert(std::tr1::shared_ptr<DocumentHost> browser, HWND handle) {
+Alert::Alert(std::shared_ptr<DocumentHost> browser, HWND handle) {
   LOG(TRACE) << "Entering Alert::Alert";
   this->browser_ = browser;
   this->alert_handle_ = handle;
diff --git a/cpp/iedriver/Alert.h b/cpp/iedriver/Alert.h
@@ -30,7 +30,7 @@ class DocumentHost;
 
 class Alert {
  public:
-  Alert(std::tr1::shared_ptr<DocumentHost> browser, HWND handle);
+  Alert(std::shared_ptr<DocumentHost> browser, HWND handle);
   virtual ~Alert(void);
 
   int Accept(void);
@@ -97,7 +97,7 @@ class Alert {
   static BOOL CALLBACK FindTextBoxes(HWND hwnd, LPARAM arg);
 
   HWND alert_handle_;
-  std::tr1::shared_ptr<DocumentHost> browser_;
+  std::shared_ptr<DocumentHost> browser_;
   bool is_standard_alert_;
   bool is_security_alert_;
   bool is_standard_control_alert_;
diff --git a/cpp/iedriver/CommandHandlerRepository.h b/cpp/iedriver/CommandHandlerRepository.h
@@ -25,7 +25,7 @@ namespace webdriver {
 // Forward declaration of classes.
 class IECommandHandler;
 
-typedef std::tr1::shared_ptr<IECommandHandler> CommandHandlerHandle;
+typedef std::shared_ptr<IECommandHandler> CommandHandlerHandle;
 
 class CommandHandlerRepository {
  public:
@@ -45,4 +45,4 @@ class CommandHandlerRepository {
 
 } // namespace webdriver
 
-#endif // WEBDRIVER_IE_COMMANDHANDLERREPOSITORY_H_
+#endif // WEBDRIVER_IE_COMMANDHANDLERREPOSITORY_H_
diff --git a/cpp/iedriver/CustomTypes.h b/cpp/iedriver/CustomTypes.h
@@ -22,10 +22,10 @@
 namespace webdriver {
 
 class Element;
-typedef std::tr1::shared_ptr<Element> ElementHandle;
+typedef std::shared_ptr<Element> ElementHandle;
 
 class DocumentHost;
-typedef std::tr1::shared_ptr<DocumentHost> BrowserHandle;
+typedef std::shared_ptr<DocumentHost> BrowserHandle;
 
 } // namespace webdriver
 
diff --git a/cpp/iedriver/ElementRepository.h b/cpp/iedriver/ElementRepository.h
@@ -38,7 +38,7 @@ class ElementRepository {
   void ClearCache(void);
   void Clear(void);
  private:
-  typedef std::tr1::unordered_map<std::string, ElementHandle> ElementMap;
+  typedef std::unordered_map<std::string, ElementHandle> ElementMap;
   ElementMap managed_elements_;
 };
 
diff --git a/cpp/iedriver/IECommandExecutor.h b/cpp/iedriver/IECommandExecutor.h
@@ -197,7 +197,7 @@ class IECommandExecutor : public CWindowImpl<IECommandExecutor> {
   }
 
  private:
-  typedef std::tr1::unordered_map<std::string, BrowserHandle> BrowserMap;
+  typedef std::unordered_map<std::string, BrowserHandle> BrowserMap;
   typedef std::map<std::string, std::wstring> ElementFindMethodMap;
 
   void AddManagedBrowser(BrowserHandle browser_wrapper);
diff --git a/cpp/webdriver-server/server.cc b/cpp/webdriver-server/server.cc
@@ -214,7 +214,7 @@ void Server::AddCommand(const std::string& url,
                         const std::string& http_verb,
                         const std::string& command_name) {
   if (this->commands_.find(url) == this->commands_.end()) {
-    this->commands_[url] = std::tr1::shared_ptr<UriInfo>(
+    this->commands_[url] = std::shared_ptr<UriInfo>(
         new UriInfo(url, http_verb, command_name));
   } else {
     this->commands_[url]->AddHttpVerb(http_verb, command_name);
diff --git a/cpp/webdriver-server/server.h b/cpp/webdriver-server/server.h
@@ -37,7 +37,7 @@ namespace webdriver {
 class UriInfo;
 class Session;
 
-typedef std::tr1::shared_ptr<Session> SessionHandle;
+typedef std::shared_ptr<Session> SessionHandle;
 
 class Server {
  public:
@@ -70,7 +70,7 @@ class Server {
 
  private:
   typedef std::map<std::string, SessionHandle> SessionMap;
-  typedef std::map<std::string, std::tr1::shared_ptr<UriInfo> > UrlMap;
+  typedef std::map<std::string, std::shared_ptr<UriInfo> > UrlMap;
 
   void Initialize(const int port,
                   const std::string& host,

Original file line number	Diff line number	Diff line change
`@@ -197,7 +197,7 @@ class IECommandExecutor : public CWindowImpl<IECommandExecutor> {`
`197`	`197`	`}`
`198`	`198`
`199`	`199`	`private:`
`200`		`- typedef std::tr1::unordered_map<std::string, BrowserHandle> BrowserMap;`
	`200`	`+ typedef std::unordered_map<std::string, BrowserHandle> BrowserMap;`
`201`	`201`	`typedef std::map<std::string, std::wstring> ElementFindMethodMap;`
`202`	`202`
`203`	`203`	`void AddManagedBrowser(BrowserHandle browser_wrapper);`