Changeset 60877 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

May 7, 2016 6:28:33 PM (9 years ago)

Author:

vboxsync

Message:

CInterface: Use RT_STRICT instead of DEBUG. Avoid using DEBUG for strict stuff!!

File:

• trunk/src/VBox/Frontends/VirtualBox/src/globals/COMDefs.h (modified) (8 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/globals/COMDefs.h

@@ -643 +643 @@
     {
         detach();
-#ifdef DEBUG
+#ifdef RT_STRICT
         mDead = true;
 #endif
@@ -685 +685 @@
     void attach(OI *aIface)
     {
-#ifdef DEBUG
         Assert(!mDead);
-#endif
         /* be aware of self assignment */
         I* amIface = ptr();
@@ -709 +707 @@
     void attach(I *aIface)
     {
-#ifdef DEBUG
         Assert(!mDead);
-#endif
         /* be aware of self assignment */
         this->addref((IUnknown*)aIface);
@@ -722 +718 @@
     void detach()
     {
-#ifdef DEBUG
        Assert(!mDead);
-#endif
        this->release((IUnknown*)ptr());
        setPtr(NULL);
@@ -732 +726 @@
     bool isNull() const
     {
-#ifdef DEBUG
        Assert(!mDead);
-#endif
        return mIface == NULL;
     }
@@ -741 +733 @@
     bool isNotNull() const
     {
-#ifdef DEBUG
        Assert(!mDead);
-#endif
        return mIface != NULL;
     }
@@ -791 +781 @@
     bool operator!=(const CInterface &that) const { return ptr() != that.ptr(); }
 
-    I* ptr() const
-    {
-#ifdef DEBUG
-      Assert(!mDead);
-#endif
-
-      return   mIface;
+    I *ptr() const
+    {
+        Assert(!mDead);
+        return mIface;
     }
 
     void setPtr(I* aObj) const
     {
-#ifdef DEBUG
-      Assert(!mDead);
-#endif
-      mIface = aObj;
+        Assert(!mDead);
+        mIface = aObj;
     }
 
 private:
-#ifdef DEBUG
+#ifdef RT_STRICT
     bool          mDead;
 #endif
@@ -817 +802 @@
     {
        mIface = NULL;
-#ifdef DEBUG
+#ifdef RT_STRICT
        mDead = false;
 #endif