Changeset 50357 in vbox

Timestamp:

Feb 6, 2014 8:12:51 PM (11 years ago)

Author:

vboxsync

Message:

Main/VirtualBox: fix Windows specific regressions, a bit too much ATL magic was ripped out

File:

trunk/src/VBox/Main/include/VirtualBoxImpl.h

-              r50356
+              r50357
     friend class CallbackEvent;
+    DECLARE_CLASSFACTORY_SINGLETON(VirtualBox)
+    DECLARE_REGISTRY_RESOURCEID(IDR_VIRTUALBOX)
+    // Kind of redundant (VirtualBoxWrap declares itself not aggregatable and
+    // CComCoClass<VirtualBox, &CLSID_VirtualBox> as aggregatable, the former
+    // is the first inheritance), but the C++ multiple inheritance rules and
+    // the class factory in svcmain.cpp needs this to disambiguate.
+    DECLARE_NOT_AGGREGATABLE(VirtualBox)
     // to postpone generation of the default ctor/dtor

Note: See TracChangeset for help on using the changeset viewer.