Remove obsolete smartany wrappers.

sorinj · Jun 5, 2019 · c12dff5 · c12dff5
1 parent ed71525
commit c12dff5
Show file tree

Hide file tree

Showing 107 changed files with 87 additions and 245 deletions.
diff --git a/omaha/base/auto_any.h b/omaha/base/auto_any.h
diff --git a/omaha/base/file.cc b/omaha/base/file.cc
@@ -68,7 +68,6 @@
 #include "omaha/base/path.h"
 #include "omaha/base/reg_key.h"
 #include "omaha/base/safe_format.h"
-#include "omaha/base/scoped_any.h"
 #include "omaha/base/string.h"
 #include "omaha/base/system.h"
 #include "omaha/base/timer.h"

diff --git a/omaha/base/file.h b/omaha/base/file.h
@@ -26,8 +26,8 @@
 #include <vector>
 
 #include "base/basictypes.h"
-#include "omaha/base/scoped_any.h"
 #include "omaha/base/store_watcher.h"
+#include "omaha/third_party/smartany/scoped_any.h"
 
 namespace omaha {
 

diff --git a/omaha/base/path.cc b/omaha/base/path.cc
@@ -92,11 +92,7 @@ HRESULT FindFilesEx(const CString& dir,
 HRESULT ExpandStringWithSpecialFolders(CString* str) {
   ASSERT(str, (L""));
 
-#pragma warning(push)
-// construction of local static object is not thread-safe
-#pragma warning(disable : 4640)
   static std::map<CString, CString> g_special_folders_mapping;
-#pragma warning(pop)
 
   if (g_special_folders_mapping.size() == 0) {
     RET_IF_FAILED(

diff --git a/omaha/base/proc_utils.cc b/omaha/base/proc_utils.cc
@@ -31,10 +31,10 @@
 #include "omaha/base/logging.h"
 #include "omaha/base/process.h"
 #include "omaha/base/reg_key.h"
-#include "omaha/base/scoped_any.h"
 #include "omaha/base/string.h"
 #include "omaha/base/utils.h"
 #include "omaha/base/window_utils.h"
+#include "omaha/third_party/smartany/scoped_any.h"
 
 namespace omaha {
 

diff --git a/omaha/base/process.cc b/omaha/base/process.cc
@@ -36,7 +36,6 @@
 #include "omaha/base/error.h"
 #include "omaha/base/logging.h"
 #include "omaha/base/safe_format.h"
-#include "omaha/base/scoped_any.h"
 #include "omaha/base/string.h"
 #include "omaha/base/system.h"
 #include "omaha/base/system_info.h"

diff --git a/omaha/base/process.h b/omaha/base/process.h
@@ -26,7 +26,7 @@
 #include <vector>
 #include "base/basictypes.h"
 #include "omaha/base/constants.h"
-#include "omaha/base/scoped_any.h"
+#include "omaha/third_party/smartany/scoped_any.h"
 
 namespace omaha {
 

diff --git a/omaha/base/queue_timer_unittest.cc b/omaha/base/queue_timer_unittest.cc
@@ -19,9 +19,9 @@
 #include <iostream>
 #include <memory>
 
-#include "omaha/base/scoped_any.h"
 #include "omaha/base/timer.h"
 #include "omaha/testing/unit_test.h"
+#include "omaha/third_party/smartany/scoped_any.h"
 
 namespace omaha {
 

diff --git a/omaha/base/reactor_unittest.cc b/omaha/base/reactor_unittest.cc
@@ -20,8 +20,8 @@
 
 #include "base/rand_util.h"
 #include "omaha/base/event_handler.h"
-#include "omaha/base/scoped_any.h"
 #include "omaha/testing/unit_test.h"
+#include "omaha/third_party/smartany/scoped_any.h"
 
 namespace omaha {
 

diff --git a/omaha/base/reg_key.cc b/omaha/base/reg_key.cc
@@ -19,7 +19,6 @@
 #include <intsafe.h>
 
 #include "omaha/base/logging.h"
-#include "omaha/base/scoped_any.h"
 #include "omaha/base/static_assert.h"
 #include "omaha/base/string.h"
 #include "omaha/base/synchronized.h"

diff --git a/omaha/base/reg_key.h b/omaha/base/reg_key.h
@@ -33,9 +33,9 @@
 #include "base/basictypes.h"
 #include "omaha/base/debug.h"
 #include "omaha/base/logging.h"
-#include "omaha/base/scoped_any.h"
 #include "omaha/base/static_assert.h"
 #include "omaha/base/store_watcher.h"
+#include "omaha/third_party/smartany/scoped_any.h"
 
 namespace omaha {
 

diff --git a/omaha/base/registry_monitor_manager.cc b/omaha/base/registry_monitor_manager.cc
@@ -30,9 +30,9 @@
 #include "omaha/base/error.h"
 #include "omaha/base/logging.h"
 #include "omaha/base/reg_key.h"
-#include "omaha/base/scoped_any.h"
 #include "omaha/base/synchronized.h"
 #include "omaha/base/thread.h"
+#include "omaha/third_party/smartany/scoped_any.h"
 
 namespace omaha {
 

diff --git a/omaha/base/registry_monitor_manager_unittest.cc b/omaha/base/registry_monitor_manager_unittest.cc
@@ -16,13 +16,13 @@
 #include <windows.h>
 #include <limits.h>
 #include "base/basictypes.h"
-#include "omaha/base/scoped_any.h"
 #include "omaha/base/reactor.h"
 #include "omaha/base/reg_key.h"
 #include "omaha/base/registry_monitor_manager.h"
 #include "omaha/base/thread.h"
 #include "omaha/base/utils.h"
 #include "omaha/testing/unit_test.h"
+#include "omaha/third_party/smartany/scoped_any.h"
 
 namespace omaha {
 

diff --git a/omaha/base/scoped_any.h b/omaha/base/scoped_any.h
diff --git a/omaha/base/scoped_impersonation.h b/omaha/base/scoped_impersonation.h
@@ -23,7 +23,7 @@
 #include "omaha/base/debug.h"
 #include "omaha/base/error.h"
 #include "omaha/base/logging.h"
-#include "omaha/base/scoped_any.h"
+#include "omaha/third_party/smartany/scoped_any.h"
 
 namespace omaha {
 

diff --git a/omaha/base/scoped_impersonation_unittest.cc b/omaha/base/scoped_impersonation_unittest.cc
@@ -15,10 +15,10 @@
 
 #include <windows.h>
 #include "base/basictypes.h"
-#include "omaha/base/scoped_any.h"
 #include "omaha/base/scoped_impersonation.h"
 #include "omaha/base/vista_utils.h"
 #include "omaha/testing/unit_test.h"
+#include "omaha/third_party/smartany/scoped_any.h"
 
 namespace omaha {
 

diff --git a/omaha/base/shell.cc b/omaha/base/shell.cc
@@ -28,10 +28,10 @@
 #include "omaha/base/logging.h"
 #include "omaha/base/path.h"
 #include "omaha/base/reg_key.h"
-#include "omaha/base/scoped_any.h"
 #include "omaha/base/string.h"
 #include "omaha/base/system.h"
 #include "omaha/base/utils.h"
+#include "omaha/third_party/smartany/scoped_any.h"
 
 namespace omaha {
 

diff --git a/omaha/base/shutdown_handler.h b/omaha/base/shutdown_handler.h
@@ -18,10 +18,12 @@
 #ifndef OMAHA_BASE_SHUTDOWN_HANDLER_H_
 #define OMAHA_BASE_SHUTDOWN_HANDLER_H_
 
+#include <objbase.h>
 #include <windows.h>
+
 #include "base/basictypes.h"
 #include "omaha/base/event_handler.h"
-#include "omaha/base/scoped_any.h"
+#include "omaha/third_party/smartany/scoped_any.h"
 
 namespace omaha {
 

diff --git a/omaha/base/signatures.cc b/omaha/base/signatures.cc
@@ -32,7 +32,6 @@
 #include "omaha/base/debug.h"
 #include "omaha/base/error.h"
 #include "omaha/base/logging.h"
-#include "omaha/base/scoped_any.h"
 #include "omaha/base/security/sha256.h"
 #include "omaha/base/security/sha.h"
 #include "omaha/base/string.h"

diff --git a/omaha/base/signatures.h b/omaha/base/signatures.h
@@ -27,7 +27,7 @@
 #include <atlstr.h>
 #include <vector>
 #include "base/basictypes.h"
-#include "omaha/base/scoped_any.h"
+#include "omaha/third_party/smartany/scoped_any.h"
 
 namespace omaha {
 

diff --git a/omaha/base/thread_pool.h b/omaha/base/thread_pool.h
@@ -20,7 +20,7 @@
 #include <objbase.h>
 
 #include "base/basictypes.h"
-#include "omaha/base/scoped_any.h"
+#include "omaha/third_party/smartany/scoped_any.h"
 
 namespace omaha {
 

diff --git a/omaha/base/user_info.cc b/omaha/base/user_info.cc
@@ -27,7 +27,7 @@
 #include "omaha/base/constants.h"
 #include "omaha/base/debug.h"
 #include "omaha/base/error.h"
-#include "omaha/base/scoped_any.h"
+#include "omaha/third_party/smartany/scoped_any.h"
 
 namespace omaha {
 

diff --git a/omaha/base/user_info_unittest.cc b/omaha/base/user_info_unittest.cc
@@ -14,10 +14,10 @@
 // ========================================================================
 
 #include "omaha/base/constants.h"
-#include "omaha/base/scoped_any.h"
 #include "omaha/base/scoped_impersonation.h"
 #include "omaha/base/user_info.h"
 #include "omaha/testing/unit_test.h"
+#include "omaha/third_party/smartany/scoped_any.h"
 
 // We can't make any assumption about the context the unit test runs, however
 // we expect the calls to succeed.

diff --git a/omaha/base/user_rights.cc b/omaha/base/user_rights.cc
@@ -21,9 +21,9 @@
 #include "omaha/base/logging.h"
 #include "omaha/base/reg_key.h"
 #include "omaha/base/scope_guard.h"
-#include "omaha/base/scoped_any.h"
 #include "omaha/base/system_info.h"
 #include "omaha/base/vistautil.h"
+#include "omaha/third_party/smartany/scoped_any.h"
 
 namespace omaha {
 

diff --git a/omaha/base/utils.cc b/omaha/base/utils.cc
@@ -38,7 +38,6 @@
 #include "omaha/base/safe_format.h"
 #include "omaha/base/scope_guard.h"
 #include "omaha/base/shell.h"
-#include "omaha/base/scoped_any.h"
 #include "omaha/base/string.h"
 #include "omaha/base/system.h"
 #include "omaha/base/system_info.h"

diff --git a/omaha/base/utils.h b/omaha/base/utils.h
@@ -35,9 +35,9 @@
 #include "omaha/base/error.h"
 #include "omaha/base/logging.h"
 #include "omaha/base/reg_key.h"
-#include "omaha/base/scoped_any.h"
 #include "omaha/base/static_assert.h"
 #include "omaha/base/user_info.h"
+#include "omaha/third_party/smartany/scoped_any.h"
 
 namespace omaha {
 

diff --git a/omaha/base/utils_unittest.cc b/omaha/base/utils_unittest.cc
@@ -31,10 +31,10 @@
 #include "omaha/base/time.h"
 #include "omaha/base/user_info.h"
 #include "omaha/base/utils.h"
-#include "omaha/base/scoped_any.h"
 #include "omaha/base/system_info.h"
 #include "omaha/base/vistautil.h"
 #include "omaha/testing/unit_test.h"
+#include "omaha/third_party/smartany/scoped_any.h"
 
 namespace omaha {
 

diff --git a/omaha/base/vista_utils.cc b/omaha/base/vista_utils.cc
@@ -28,14 +28,14 @@
 #include "omaha/base/process.h"
 #include "omaha/base/reg_key.h"
 #include "omaha/base/scope_guard.h"
-#include "omaha/base/scoped_any.h"
 #include "omaha/base/smart_handle.h"
 #include "omaha/base/synchronized.h"
 #include "omaha/base/system.h"
 #include "omaha/base/system_info.h"
 #include "omaha/base/user_info.h"
 #include "omaha/base/user_rights.h"
 #include "omaha/base/utils.h"
+#include "omaha/third_party/smartany/scoped_any.h"
 
 #define LOW_INTEGRITY_SID_W           NOTRANSL(L"S-1-16-4096")
 

diff --git a/omaha/base/vista_utils_unittest.cc b/omaha/base/vista_utils_unittest.cc
@@ -16,12 +16,12 @@
 #include <windows.h>
 #include "omaha/base/app_util.h"
 #include "omaha/base/path.h"
-#include "omaha/base/scoped_any.h"
 #include "omaha/base/string.h"
 #include "omaha/base/utils.h"
 #include "omaha/base/vista_utils.h"
 #include "omaha/base/vistautil.h"
 #include "omaha/testing/unit_test.h"
+#include "omaha/third_party/smartany/scoped_any.h"
 
 namespace omaha {
 

diff --git a/omaha/base/xml_utils_unittest.cc b/omaha/base/xml_utils_unittest.cc
@@ -20,9 +20,9 @@
 #include "omaha/base/file.h"
 #include "omaha/base/string.h"
 #include "omaha/base/utils.h"
-#include "omaha/base/scoped_any.h"
 #include "omaha/base/xml_utils.h"
 #include "omaha/testing/unit_test.h"
+#include "omaha/third_party/smartany/scoped_any.h"
 
 namespace omaha {
 

diff --git a/omaha/client/install.cc b/omaha/client/install.cc
@@ -26,7 +26,6 @@
 #include "omaha/base/process.h"
 #include "omaha/base/reg_key.h"
 #include "omaha/base/safe_format.h"
-#include "omaha/base/scoped_any.h"
 #include "omaha/base/string.h"
 #include "omaha/base/time.h"
 #include "omaha/base/utils.h"
@@ -43,6 +42,7 @@
 #include "omaha/common/oem_install_utils.h"
 #include "omaha/common/ping.h"
 #include "omaha/setup/setup_metrics.h"
+#include "omaha/third_party/smartany/scoped_any.h"
 #include "omaha/ui/splash_screen.h"
 
 namespace omaha {

diff --git a/omaha/common/crash_utils.cc b/omaha/common/crash_utils.cc
@@ -32,12 +32,12 @@
 #include "omaha/base/omaha_version.h"
 #include "omaha/base/path.h"
 #include "omaha/base/safe_format.h"
-#include "omaha/base/scoped_any.h"
 #include "omaha/base/user_info.h"
 #include "omaha/base/vistautil.h"
 #include "omaha/common/command_line_builder.h"
 #include "omaha/common/config_manager.h"
 #include "omaha/common/goopdate_utils.h"
+#include "omaha/third_party/smartany/scoped_any.h"
 #include "third_party/breakpad/src/client/windows/common/ipc_protocol.h"
 #include "third_party/breakpad/src/client/windows/crash_generation/client_info.h"