Changeset 10151

Timestamp:

07/03/08 14:26:56 (6 months ago)

Author:

vboxsync

Message:

Main: SafeArray?: Fixed: SafeArrayTraits::asInParam_Arr() was protected on XPCOM which prevented from using input safe arrays in methods.

Files:

• trunk/include/VBox/com/array.h (modified) (10 diffs)

trunk/include/VBox/com/array.h

@@ -214 +214 @@
-struct SafeArrayTraits
-{
+protected:
+
-    static void Init (T &aElem) { aElem = 0; }
-    static void Uninit (T &aElem) { aElem = 0; }
-    static void Copy (const T &aFrom, T &aTo) { aTo = aFrom; }
+
+public:
-
-    /* Magic to workaround strict rules of par. 4.4.4 of the C++ standard (that
@@ -236 +240 @@
-struct SafeArrayTraits <PRUnichar *>
-{
+protected:
+
-    static void Init (PRUnichar * &aElem) { aElem = NULL; }
-    static void Uninit (PRUnichar * &aElem)
@@ -252 +258 @@
-    }
-
+public:
+
-    /* Magic to workaround strict rules of par. 4.4.4 of the C++ standard */
-    static const PRUnichar **__asInParam_Arr (PRUnichar **aArr)
@@ -276 +284 @@
-struct SafeArrayTraits <LONG>
-{
+protected:
+
-    static VARTYPE VarType() { return VT_I4; }
-    static void Copy (LONG aFrom, LONG &aTo) { aTo = aFrom; }
@@ -283 +293 @@
-struct SafeArrayTraits <ULONG>
-{
+protected:
+
-    static VARTYPE VarType() { return VT_UI4; }
-    static void Copy (ULONG aFrom, ULONG &aTo) { aTo = aFrom; }
@@ -290 +302 @@
-struct SafeArrayTraits <BSTR>
-{
+protected:
+
-    static VARTYPE VarType() { return VT_BSTR; }
-
@@ -329 +343 @@
- */
-template  <typename T, class Traits = SafeArrayTraits <T> >
-rotected
+ublic
-{
-public:
@@ -781 +795 @@
-struct SafeIfaceArrayTraits
-{
+protected:
+
-    static void Init (I * &aElem) { aElem = NULL; }
-    static void Uninit (I * &aElem)
@@ -802 +818 @@
-    }
-
+public:
+
-    /* Magic to workaround strict rules of par. 4.4.4 of the C++ standard. */
-    static I **__asInParam_Arr (I **aArr) { return aArr; }
@@ -812 +830 @@
-struct SafeIfaceArrayTraits
-{
+protected:
+
-    static VARTYPE VarType() { return VT_UNKNOWN; }
-