Changeset 30631 in vbox for trunk/src/VBox/Main/xpcom

Timestamp:

Jul 5, 2010 7:20:03 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

63366

Message:

Main: Escape the (nsCID) { uuid-bits } compound literals expression so that they don't cause trouble with -pedantic is used. (C++ lagging behind C99 again.)

Location:

trunk/src/VBox/Main/xpcom

Files:

• server.cpp (modified) (1 diff)
• server_module.cpp (modified) (1 diff)

trunk/src/VBox/Main/xpcom/server.cpp

@@ -637 +637 @@
     nsModuleComponentInfoEx(
         "VirtualBox component",
-        (nsCID) NS_VIRTUALBOX_CID,
+        CLSID_VirtualBox,
         NS_VIRTUALBOX_CONTRACTID,
         VirtualBoxConstructor, // constructor funcion

trunk/src/VBox/Main/xpcom/server_module.cpp

@@ -241 +241 @@
 
             rc = dconServ->CreateInstance (serverID,
-                                           (nsCID) NS_VIRTUALBOX_CID,
+                                           CLSID_VirtualBox,
                                            aIID, aResult);
             if (NS_SUCCEEDED(rc))