You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by db...@apache.org on 2008/09/14 22:10:49 UTC

svn commit: r695278 - in /xalan/c/trunk/src/xalanc: Include/GCCDefinitions.hpp XPath/XPath.hpp XPath/XPathFunctionTable.hpp

Author: dbertoni
Date: Sun Sep 14 13:10:49 2008
New Revision: 695278

URL: http://svn.apache.org/viewvc?rev=695278&view=rev
Log:
Removed some obsolete defines.

Modified:
    xalan/c/trunk/src/xalanc/Include/GCCDefinitions.hpp
    xalan/c/trunk/src/xalanc/XPath/XPath.hpp
    xalan/c/trunk/src/xalanc/XPath/XPathFunctionTable.hpp

Modified: xalan/c/trunk/src/xalanc/Include/GCCDefinitions.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Include/GCCDefinitions.hpp?rev=695278&r1=695277&r2=695278&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Include/GCCDefinitions.hpp (original)
+++ xalan/c/trunk/src/xalanc/Include/GCCDefinitions.hpp Sun Sep 14 13:10:49 2008
@@ -35,9 +35,7 @@
 
 #if __GNUC__ < 3
 #define XALAN_CLASSIC_IOSTREAMS
-#define XALAN_NO_MEMBER_TEMPLATES
 #define XALAN_NO_STD_ALLOCATORS
-#define XALAN_NO_USING_DECLARATION
 #endif
 
 #define XALAN_SGI_BASED_STL

Modified: xalan/c/trunk/src/xalanc/XPath/XPath.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XPath.hpp?rev=695278&r1=695277&r2=695278&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XPath.hpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XPath.hpp Sun Sep 14 13:10:49 2008
@@ -984,21 +984,6 @@
         return s_functions;
     }
 
-#if defined(XALAN_NO_MEMBER_TEMPLATES)
-    typedef XPathFunctionTable::InstalledFunctionNameVectorType
-                    InstalledFunctionNameVectorType;
-
-    /**
-     * Add the names for the installed functions to a vector strings.
-     * 
-     * @param theVector added to
-     */
-    static void
-    getInstalledFunctionNames(InstalledFunctionNameVectorType&	theVector)
-    {
-        s_functions.getInstalledFunctionNames(theVector);
-    }
-#else
     /**
      * Add the names for the installed functions to a vector strings.
      * 
@@ -1010,7 +995,6 @@
     {
         s_functions.getInstalledFunctionNames(theIterator);
     }
-#endif
 
     static void
     destroyTable()

Modified: xalan/c/trunk/src/xalanc/XPath/XPathFunctionTable.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XPathFunctionTable.hpp?rev=695278&r1=695277&r2=695278&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XPathFunctionTable.hpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XPathFunctionTable.hpp Sun Sep 14 13:10:49 2008
@@ -299,34 +299,6 @@
         return getFunctionIndex(theFunctionName) != InvalidFunctionNumberID ? true : false;
     }
 
-#if defined(XALAN_NO_MEMBER_TEMPLATES)
-
-    typedef XalanVector<XalanDOMString>         InstalledFunctionNameVectorType;
-
-    /**
-     * Add a list of the names of installed functions to a vector of names.
-     * 
-     * @param theVector vector of function name strings added to
-     */
-    void
-    getInstalledFunctionNames(InstalledFunctionNameVectorType&  theVector) const
-    {
-        XalanDOMString  theString;
-
-        for (int i = 0; i < TableSize; ++i)
-        {
-            if (m_functionTable[i] != 0)
-            {
-                theString.assign(
-                    s_functionNames[i].m_name,
-                    s_functionNames[i].m_size);
-
-                theVector.push_back(theString);
-            }
-        }
-    }
-#else
-
     /**
      * Add a list of the names of installed functions to a vector of names.
      * 
@@ -352,7 +324,6 @@
             }
         }
     }
-#endif
 
     struct FunctionNameTableEntry
     {



---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org