Changeset 15051 in vbox for trunk/src/VBox/Main/Performance.cpp

Timestamp:

Dec 5, 2008 5:20:00 PM (16 years ago)

Author:

vboxsync

Message:

Main: Cleaned up the long standing const BSTR = const (OLECHAR *) on WIn32 vs (const PRunichar) * on XPCOM clash. Cleaned up BSTR/GUID macros (IN_BSTR replaces INPTR BSTR, IN_GUID replaces INPTR GUIDPARAM, OUT_GUID replaces GUIDPARAMOUT).

File:

• trunk/src/VBox/Main/Performance.cpp (modified) (3 diffs)

trunk/src/VBox/Main/Performance.cpp

@@ -418 +418 @@
 }
 
-Filter::Filter(ComSafeArrayIn(INPTR BSTR, metricNames),
+Filter::Filter(ComSafeArrayIn(IN_BSTR, metricNames),
                ComSafeArrayIn(IUnknown *, objects))
 {
@@ -449 +449 @@
     else
     {
-        com::SafeArray <INPTR BSTR> nameArray(ComSafeArrayInArg(metricNames));
+        com::SafeArray <IN_BSTR> nameArray(ComSafeArrayInArg(metricNames));
         if (ComSafeArrayInIsNull(objects))
         {
@@ -466 +466 @@
 }
 
-void Filter::init(ComSafeArrayIn(INPTR BSTR, metricNames),
+void Filter::init(ComSafeArrayIn(IN_BSTR, metricNames),
                   ComSafeArrayIn(IUnknown *, objects))
 {
-    com::SafeArray <INPTR BSTR> nameArray(ComSafeArrayInArg(metricNames));
+    com::SafeArray <IN_BSTR> nameArray(ComSafeArrayInArg(metricNames));
     com::SafeIfaceArray <IUnknown> objectArray(ComSafeArrayInArg(objects));