Changeset 72974 in vbox for trunk/src/VBox/Main/idl

Timestamp:

Jul 8, 2018 1:35:21 PM (7 years ago)

Author:

vboxsync

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

123526

Message:

Main: Some early sketches on how to get proper C++ enums with xpidl.

File:

• trunk/src/VBox/Main/idl/xpidl.xsl (modified) (4 diffs)

trunk/src/VBox/Main/idl/xpidl.xsl

@@ -36 +36 @@
      portability concerns.
  -->
-<xsl:param name="g_fHackEnumsOntoCppEnums" select="'no'"/>
+<xsl:param name="g_fHackEnumsOntoCppEnums" select="'yes'"/>
 
 
@@ -717 +717 @@
   <xsl:text>};&#x0A;&#x0A;</xsl:text>
   <xsl:choose>
+
     <xsl:when test="$g_fHackEnumsOntoCppEnums = 'yes'">
       <xsl:text>
-/* IDL typedef for enum ', @name, ' */
-typedef PRUint32 </xsl:text><xsl:value-of select="concat(@name, '_EnumT')" /><xsl:text>;
-
-/* C++ enum type name for ', @name, ' */
+/* IDL typedef for enum </xsl:text><xsl:value-of select="@name" /><xsl:text> and C++ mappings. */
 %{C++
+#ifndef VBOX_WITH_XPCOM_CPP_ENUM_HACK
+%}
+typedef PRUint32 </xsl:text><xsl:value-of select="concat(@name, '_T')" /><xsl:text>;
+%{C++
+</xsl:text>
+      <xsl:for-each select="const">
+        <xsl:value-of select="concat('# define ', ../@name, '_', @name, ' ', ../@name, '::', @name, '&#x0A;')"/>
+      </xsl:for-each>
+      <xsl:text>#else /* VBOX_WITH_XPCOM_CPP_ENUM_HACK */
 typedef enum </xsl:text>
       <xsl:value-of select="concat(@name, '_T')" />
@@ -733 +740 @@
       <xsl:value-of select="concat('    ', @name, '_32BitHack = 0x7fffffff', '&#x0A;')"/>
       <xsl:text>} </xsl:text><xsl:value-of select="concat(@name, '_T')"/><xsl:text>;
-#ifdef AssertCompileSize
+# ifdef AssertCompileSize
 AssertCompileSize(</xsl:text><xsl:value-of select="concat(@name, '_T')"/><xsl:text>, sizeof(PRUint32));
-#endif
-/* Use the preprocessor to replace the IDL enum typedef with our C++ enum so it will
-   behave just like we had real enum support in xpidl or if were using msidl. */
-#define </xsl:text><xsl:value-of select="concat(@name, '_EnumT ', @name, '_T')" /><xsl:text>
-#ifndef VBOX_WITH_XPCOM_CPP_ENUM_HACK
-# define VBOX_WITH_XPCOM_CPP_ENUM_HACK 1
-#endif
+# endif
+#endif /* VBOX_WITH_XPCOM_CPP_ENUM_HACK */
 %}
 
@@ -953 +955 @@
               <xsl:choose>
                 <xsl:when test="$g_fHackEnumsOntoCppEnums = 'yes'">
-                  <xsl:value-of select="concat(., '_EnumT')" />
+                  <xsl:value-of select="concat(., '_T')" />
                 </xsl:when>
                 <xsl:otherwise>