Changeset 32780 in vbox for trunk/include/VBox/com

Timestamp:

Sep 27, 2010 7:00:22 PM (15 years ago)

Author:

vboxsync

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

66229

Message:

com/Guid: remove conversion operators to eliminate any compiler surprises. Caught one totally unexpected issue which was indirectly caused by the similar Bstr cleanup, as there still is a Bstr->Guid conversion and thus the Guid magic was triggered

File:

• trunk/include/VBox/com/Guid.h (modified) (4 diffs)

trunk/include/VBox/com/Guid.h

@@ -7 +7 @@
 
 /*
- * Copyright (C) 2006-2007 Oracle Corporation
+ * Copyright (C) 2006-2010 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -168 +168 @@
     }
 
-    operator bool() const
-    {
-        return !isEmpty();
-    }
-
     bool operator==(const Guid &that) const { return ::RTUuidCompare (&uuid, &that.uuid) == 0; }
     bool operator==(const GUID &guid) const { return ::RTUuidCompare (&uuid, (PRTUUID) &guid) == 0; }
@@ -180 +175 @@
     bool operator<(const GUID &guid) const { return ::RTUuidCompare (&uuid, (PRTUUID) &guid) < 0; }
 
-    /* to pass instances as IN_GUID parameters to interface methods */
-    operator const GUID&() const
-    {
-        return *(GUID *) &uuid;
-    }
-
-    /* to directly pass instances to RTPrintf("%RTuuid") */
-    PRTUUID ptr()
-    {
-        return &uuid;
+    /* to directly copy the contents to a GUID, or for passing it as
+     * an input parameter of type (const GUID *), the compiler converts */
+    const GUID &ref() const
+    {
+        return *(const GUID *)&uuid;
     }
 
     /* to pass instances to printf-like functions */
-    PCRTUUID raw() const
-    {
-        return &uuid;
-    }
-
-    /* to pass instances to RTUuid*() as a constant argument */
-    operator const RTUUID*() const
-    {
-        return &uuid;
+    const PCRTUUID raw() const
+    {
+        return (PCRTUUID)&uuid;
     }
 
@@ -311 +295 @@
 }
 
-
-/* work around error C2593 of the stupid MSVC 7.x ambiguity resolver */
-WORKAROUND_MSVC7_ERROR_C2593_FOR_BOOL_OP (Guid)
-
 } /* namespace com */