Changeset 73873 in vbox for trunk/src

Timestamp:

Aug 24, 2018 1:47:20 PM (6 years ago)

Author:

vboxsync

Message:

OCI: Move OCI code to the extension pack

Location:

trunk/src/VBox/Main

Files:

• Makefile.kmk (modified) (1 diff)
• src-server/CloudProviderManagerImpl.cpp (modified) (2 diffs)
• src-server/OCIProfile.cpp (deleted)

trunk/src/VBox/Main/Makefile.kmk

@@ -457 +457 @@
         src-server/ClientToken.cpp \
         src-server/CloudProviderManagerImpl.cpp \
-        $(if $(VBOX_WITH_CLOUD_PROVIDERS_IN_EXTPACK),, \
-                src-server/CloudAPI.cpp \
-                src-server/CloudClientImpl.cpp \
-                src-server/OCIProvider.cpp \
-                src-server/OCIProfile.cpp) \
         src-server/DHCPServerImpl.cpp \
         src-server/NetworkServiceRunner.cpp \

trunk/src/VBox/Main/src-server/CloudProviderManagerImpl.cpp

@@ -21 +21 @@
 #include "VirtualBoxImpl.h"
 #include "CloudProviderManagerImpl.h"
-#ifdef VBOX_WITH_CLOUD_PROVIDERS_IN_EXTPACK
-# include "ExtPackManagerImpl.h"
-#else
-# include "OCIProvider.h"
-#endif
+#include "ExtPackManagerImpl.h"
 #include "AutoCaller.h"
 #include "Logging.h"
@@ -78 +74 @@
     }
 #else
-    ComObjPtr<OCIProvider> pOCIProvider;
-    HRESULT hrc = pOCIProvider.createObject();
-    if (FAILED(hrc))
-        return hrc;
-    hrc = pOCIProvider->init(aParent);
-    if (FAILED(hrc))
-        return hrc;
-    m_apCloudProviders.push_back(pOCIProvider);
+    RT_NOREF(aParent);
 #endif