Changeset 48781 in vbox

Timestamp:

Oct 1, 2013 2:43:59 AM (11 years ago)

Author:

vboxsync

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

89419

Message:

iprt/list.h,xml.h: Because of gcc, we need a C++ version of a bunch of the RTListXxx macros that uses RT_FROM_CPP_MEMBER instead of RT_FROM_MEMBER. I don't dare speculate on the compilers optimizing the two macros in the same way, thus two sets of macros.

Location:

trunk

Files:

• include/iprt/cpp/xml.h (modified) (4 diffs)
• include/iprt/list.h (modified) (11 diffs)
• src/VBox/Runtime/r3/xml.cpp (modified) (5 diffs)

trunk/include/iprt/cpp/xml.h

@@ -461 +461 @@
     const Node *getFirstChild() const
     {
-        return RTListGetFirst(&m_children, const Node, m_childEntry);
+        return RTListGetFirstCpp(&m_children, const Node, m_childEntry);
     }
 
@@ -468 +468 @@
     const Node *getLastChild() const
     {
-        return RTListGetLast(&m_children, const Node, m_childEntry);
+        return RTListGetLastCpp(&m_children, const Node, m_childEntry);
     }
 
@@ -477 +477 @@
         if (!m_pParent)
             return NULL;
-        return RTListGetPrev(&m_pParent->m_children, this, const Node, m_childEntry);
+        return RTListGetPrevCpp(&m_pParent->m_children, this, const Node, m_childEntry);
     }
 
@@ -486 +486 @@
         if (!m_pParent)
             return NULL;
-        return RTListGetNext(&m_pParent->m_children, this, const Node, m_childEntry);
+        return RTListGetNextCpp(&m_pParent->m_children, this, const Node, m_childEntry);
     }
     /** @} */

trunk/include/iprt/list.h

@@ -184 +184 @@
 #define RTListNodeIsDummy(pList, pNode, Type, Member) \
          ( (pNode) == RT_FROM_MEMBER((pList), Type, Member) )
+/** @copydoc RTListNodeIsDummy */
+#define RTListNodeIsDummyCpp(pList, pNode, Type, Member) \
+         ( (pNode) == RT_FROM_CPP_MEMBER((pList), Type, Member) )
 
 /**
@@ -206 +209 @@
 #define RTListNodeGetNext(pCurNode, Type, Member) \
     RT_FROM_MEMBER((pCurNode)->pNext, Type, Member)
+/** @copydoc RTListNodeGetNext */
+#define RTListNodeGetNextCpp(pCurNode, Type, Member) \
+    RT_FROM_CPP_MEMBER((pCurNode)->pNext, Type, Member)
 
 /**
@@ -218 +224 @@
 #define RTListNodeGetPrev(pCurNode, Type, Member) \
     RT_FROM_MEMBER((pCurNode)->pPrev, Type, Member)
+/** @copydoc RTListNodeGetPrev */
+#define RTListNodeGetPrevCpp(pCurNode, Type, Member) \
+    RT_FROM_CPP_MEMBER((pCurNode)->pPrev, Type, Member)
 
 /**
@@ -231 +240 @@
 #define RTListGetFirst(pList, Type, Member) \
     (!RTListIsEmpty(pList) ? RTListNodeGetNext(pList, Type, Member) : NULL)
+/** @copydoc RTListGetFirst */
+#define RTListGetFirstCpp(pList, Type, Member) \
+    (!RTListIsEmpty(pList) ? RTListNodeGetNextCpp(pList, Type, Member) : NULL)
 
 /**
@@ -244 +256 @@
 #define RTListGetLast(pList, Type, Member) \
     (!RTListIsEmpty(pList) ? RTListNodeGetPrev(pList, Type, Member) : NULL)
+/** @copydoc RTListGetLast */
+#define RTListGetLastCpp(pList, Type, Member) \
+    (!RTListIsEmpty(pList) ? RTListNodeGetPrevCpp(pList, Type, Member) : NULL)
 
 /**
@@ -257 +272 @@
 #define RTListGetNext(pList, pCurNode, Type, Member) \
     ( (pCurNode)->Member.pNext != (pList) ? RT_FROM_MEMBER((pCurNode)->Member.pNext, Type, Member) : NULL )
+/** @copydoc RTListGetNext */
+#define RTListGetNextCpp(pList, pCurNode, Type, Member) \
+    ( (pCurNode)->Member.pNext != (pList) ? RT_FROM_CPP_MEMBER((pCurNode)->Member.pNext, Type, Member) : NULL )
 
 /**
@@ -270 +288 @@
 #define RTListGetPrev(pList, pCurNode, Type, Member) \
     ( (pCurNode)->Member.pPrev != (pList) ? RT_FROM_MEMBER((pCurNode)->Member.pPrev, Type, Member) : NULL )
+/** @copydoc RTListGetPrev */
+#define RTListGetPrevCpp(pList, pCurNode, Type, Member) \
+    ( (pCurNode)->Member.pPrev != (pList) ? RT_FROM_CPP_MEMBER((pCurNode)->Member.pPrev, Type, Member) : NULL )
 
 /**
@@ -283 +304 @@
          !RTListNodeIsDummy(pList, pIterator, Type, Member); \
          pIterator = RT_FROM_MEMBER((pIterator)->Member.pNext, Type, Member) )
+/** @copydoc RTListForEach */
+#define RTListForEachCpp(pList, pIterator, Type, Member) \
+    for (pIterator = RTListNodeGetNextCpp(pList, Type, Member); \
+         !RTListNodeIsDummy(pList, pIterator, Type, Member); \
+         pIterator = RT_FROM_CPP_MEMBER((pIterator)->Member.pNext, Type, Member) )
 
 
@@ -302 +328 @@
          pIterator = pIterNext, \
          pIterNext = RT_FROM_MEMBER((pIterator)->Member.pNext, Type, Member) )
+/** @copydoc RTListForEachSafe */
+#define RTListForEachSafeCpp(pList, pIterator, pIterNext, Type, Member) \
+    for (pIterator = RTListNodeGetNextCpp(pList, Type, Member), \
+         pIterNext = RT_FROM_CPP_MEMBER((pIterator)->Member.pNext, Type, Member); \
+         !RTListNodeIsDummy(pList, pIterator, Type, Member); \
+         pIterator = pIterNext, \
+         pIterNext = RT_FROM_CPP_MEMBER((pIterator)->Member.pNext, Type, Member) )
 
 
@@ -316 +349 @@
          !RTListNodeIsDummy(pList, pIterator, Type, Member); \
          pIterator = RT_FROM_MEMBER((pIterator)->Member.pPrev, Type, Member) )
+/** @copydoc RTListForEachReverse */
+#define RTListForEachReverseCpp(pList, pIterator, Type, Member) \
+    for (pIterator = RTListNodeGetPrevCpp(pList, Type, Member); \
+         !RTListNodeIsDummy(pList, pIterator, Type, Member); \
+         pIterator = RT_FROM_CPP_MEMBER((pIterator)->Member.pPrev, Type, Member) )
 
 
@@ -334 +372 @@
          pIterator = pIterPrev, \
          pIterPrev = RT_FROM_MEMBER((pIterator)->Member.pPrev, Type, Member) )
+/** @copydoc RTListForEachReverseSafe */
+#define RTListForEachReverseSafeCpp(pList, pIterator, pIterPrev, Type, Member) \
+    for (pIterator = RTListNodeGetPrevCpp(pList, Type, Member), \
+         pIterPrev = RT_FROM_CPP_MEMBER((pIterator)->Member.pPrev, Type, Member); \
+         !RTListNodeIsDummy(pList, pIterator, Type, Member); \
+         pIterator = pIterPrev, \
+         pIterPrev = RT_FROM_CPP_MEMBER((pIterator)->Member.pPrev, Type, Member) )
 
 

trunk/src/VBox/Runtime/r3/xml.cpp

@@ -472 +472 @@
 #ifndef USE_STD_LIST_FOR_CHILDREN
     Node *pCur, *pNext;
-    RTListForEachSafe(&m_children, pCur, pNext, Node, m_childEntry)
+    RTListForEachSafeCpp(&m_children, pCur, pNext, Node, m_childEntry)
     {
         delete pCur;
@@ -764 +764 @@
 #ifndef USE_STD_LIST_FOR_CHILDREN
     Node *p;
-    RTListForEach(&m_children, p, Node, m_childEntry)
+    RTListForEachCpp(&m_children, p, Node, m_childEntry)
 #else
     for (Data::InternalNodesList::iterator it = m->children.begin();
@@ -798 +798 @@
 #ifndef USE_STD_LIST_FOR_CHILDREN
     Node *p;
-    RTListForEach(&m_children, p, Node, m_childEntry)
+    RTListForEachCpp(&m_children, p, Node, m_childEntry)
     {
         if (p->isElement())
@@ -832 +832 @@
 #ifndef USE_STD_LIST_FOR_CHILDREN
     Node *p;
-    RTListForEach(&m_children, p, Node, m_childEntry)
+    RTListForEachCpp(&m_children, p, Node, m_childEntry)
     {
         if (p->isElement())
@@ -882 +882 @@
      *        pointers in this variant.  */
     Node *p;
-    RTListForEach(&m_children, p, Node, m_childEntry)
+    RTListForEachCpp(&m_children, p, Node, m_childEntry)
     {
         if (p->isElement())