xalan-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dbert...@apache.org
Subject svn commit: r680433 [1/2] - in /xalan/c/trunk: Tests/Dom2Dom/ Tests/Params/ Tests/PerfT/ Tests/Threads/ samples/DocumentBuilder/ samples/XalanTransformerCallback/ src/xalanc/DOMSupport/ src/xalanc/Harness/ src/xalanc/ICUBridge/ src/xalanc/Include/ src/...
Date Mon, 28 Jul 2008 18:25:24 GMT
Author: dbertoni
Date: Mon Jul 28 11:25:22 2008
New Revision: 680433

URL: http://svn.apache.org/viewvc?rev=680433&view=rev
Log:
Cleaned up crufty old stuff for obsolete compilers, etc.

Modified:
    xalan/c/trunk/Tests/Dom2Dom/dom2dom.cpp
    xalan/c/trunk/Tests/Params/Params.cpp
    xalan/c/trunk/Tests/PerfT/perft.cpp
    xalan/c/trunk/Tests/Threads/ThreadTest.cpp
    xalan/c/trunk/samples/DocumentBuilder/DocumentBuilder.cpp
    xalan/c/trunk/samples/XalanTransformerCallback/XalanTransformerCallback.cpp
    xalan/c/trunk/src/xalanc/DOMSupport/DOMServices.cpp
    xalan/c/trunk/src/xalanc/DOMSupport/DOMServices.hpp
    xalan/c/trunk/src/xalanc/DOMSupport/XalanDocumentPrefixResolver.cpp
    xalan/c/trunk/src/xalanc/Harness/XalanFileUtility.cpp
    xalan/c/trunk/src/xalanc/ICUBridge/ICUBridge.cpp
    xalan/c/trunk/src/xalanc/ICUBridge/ICUBridgeCollationCompareFunctorImpl.cpp
    xalan/c/trunk/src/xalanc/ICUBridge/ICUFormatNumberFunctor.cpp
    xalan/c/trunk/src/xalanc/Include/AIXDefinitions.hpp
    xalan/c/trunk/src/xalanc/Include/GCCDefinitions.hpp
    xalan/c/trunk/src/xalanc/Include/HPUXDefinitions.hpp
    xalan/c/trunk/src/xalanc/Include/IntelDefinitions.hpp
    xalan/c/trunk/src/xalanc/Include/OS390Definitions.hpp
    xalan/c/trunk/src/xalanc/Include/OS400Definitions.hpp
    xalan/c/trunk/src/xalanc/Include/SolarisDefinitions.hpp
    xalan/c/trunk/src/xalanc/Include/TRU64Definitions.hpp
    xalan/c/trunk/src/xalanc/Include/VCPPDefinitions.hpp
    xalan/c/trunk/src/xalanc/Include/XalanMemMgrHelper.hpp
    xalan/c/trunk/src/xalanc/PlatformSupport/DOMStringHelper.cpp
    xalan/c/trunk/src/xalanc/PlatformSupport/DOMStringHelper.hpp
    xalan/c/trunk/src/xalanc/PlatformSupport/XalanEncodingPropertyCache.cpp
    xalan/c/trunk/src/xalanc/PlatformSupport/XalanICUMessageLoader.cpp
    xalan/c/trunk/src/xalanc/PlatformSupport/XalanOutputStream.cpp
    xalan/c/trunk/src/xalanc/PlatformSupport/XalanTranscodingServices.cpp
    xalan/c/trunk/src/xalanc/PlatformSupport/XalanUTF16Transcoder.cpp
    xalan/c/trunk/src/xalanc/TestXPath/TestXPath.cpp
    xalan/c/trunk/src/xalanc/TestXSLT/process.cpp
    xalan/c/trunk/src/xalanc/XMLSupport/FormatterTreeWalker.cpp
    xalan/c/trunk/src/xalanc/XPath/ElementPrefixResolverProxy.cpp
    xalan/c/trunk/src/xalanc/XPath/FunctionID.cpp
    xalan/c/trunk/src/xalanc/XPath/FunctionLang.cpp
    xalan/c/trunk/src/xalanc/XPath/XNodeSetBase.cpp
    xalan/c/trunk/src/xalanc/XPath/XNumber.cpp
    xalan/c/trunk/src/xalanc/XPath/XObjectFactoryDefault.cpp
    xalan/c/trunk/src/xalanc/XPath/XObjectResultTreeFragProxy.cpp
    xalan/c/trunk/src/xalanc/XPath/XPath.cpp
    xalan/c/trunk/src/xalanc/XPath/XPathExecutionContextDefault.cpp
    xalan/c/trunk/src/xalanc/XPath/XPathExecutionContextDefault.hpp
    xalan/c/trunk/src/xalanc/XPath/XStringBase.cpp
    xalan/c/trunk/src/xalanc/XPath/XalanDocumentFragmentNodeRefListBaseProxy.cpp
    xalan/c/trunk/src/xalanc/XPathCAPI/XPathCAPI.cpp
    xalan/c/trunk/src/xalanc/XSLT/ElemApplyTemplates.cpp
    xalan/c/trunk/src/xalanc/XSLT/ElemNumber.cpp
    xalan/c/trunk/src/xalanc/XSLT/ElemTemplateElement.cpp
    xalan/c/trunk/src/xalanc/XSLT/ElemValueOf.cpp
    xalan/c/trunk/src/xalanc/XSLT/ElemWithParam.cpp
    xalan/c/trunk/src/xalanc/XSLT/FunctionDocument.cpp
    xalan/c/trunk/src/xalanc/XSLT/FunctionUnparsedEntityURI.cpp
    xalan/c/trunk/src/xalanc/XSLT/Stylesheet.cpp
    xalan/c/trunk/src/xalanc/XSLT/StylesheetConstructionContextDefault.hpp
    xalan/c/trunk/src/xalanc/XSLT/StylesheetExecutionContextDefault.cpp
    xalan/c/trunk/src/xalanc/XSLT/StylesheetHandler.cpp
    xalan/c/trunk/src/xalanc/XSLT/StylesheetRoot.cpp
    xalan/c/trunk/src/xalanc/XSLT/TraceListenerDefault.cpp
    xalan/c/trunk/src/xalanc/XSLT/XResultTreeFrag.cpp
    xalan/c/trunk/src/xalanc/XSLT/XSLTEngineImpl.cpp
    xalan/c/trunk/src/xalanc/XalanExtensions/FunctionEvaluate.cpp
    xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeHelper.cpp
    xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeParserLiaison.cpp
    xalan/c/trunk/src/xalanc/XalanTransformer/XalanCAPI.cpp
    xalan/c/trunk/src/xalanc/XercesParserLiaison/Deprecated/XercesBridgeNavigator.cpp
    xalan/c/trunk/src/xalanc/XercesParserLiaison/Deprecated/XercesDOM_NodeHack.hpp
    xalan/c/trunk/src/xalanc/XercesParserLiaison/Deprecated/XercesDocumentBridge.cpp
    xalan/c/trunk/src/xalanc/XercesParserLiaison/Deprecated/XercesElementBridge.cpp
    xalan/c/trunk/src/xalanc/XercesParserLiaison/Deprecated/XercesNamedNodeMapBridge.cpp
    xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDOMFormatterWalker.cpp
    xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDOMWalker.cpp
    xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDocumentWrapper.cpp
    xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesLiaisonXalanDOMStringPool.cpp
    xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesWrapperNavigator.cpp

Modified: xalan/c/trunk/Tests/Dom2Dom/dom2dom.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/Tests/Dom2Dom/dom2dom.cpp?rev=680433&r1=680432&r2=680433&view=diff
==============================================================================
--- xalan/c/trunk/Tests/Dom2Dom/dom2dom.cpp (original)
+++ xalan/c/trunk/Tests/Dom2Dom/dom2dom.cpp Mon Jul 28 11:25:22 2008
@@ -349,8 +349,8 @@
 					}
 					else
 					{
-						const XalanDOMString	mimeEncoding(XALAN_STATIC_UCODE_STRING("UTF-8"), theManager);
-						const XalanDOMString	encoding(XALAN_STATIC_UCODE_STRING("UTF-8"), theManager);
+						const XalanDOMString	mimeEncoding("UTF-8", theManager);
+						const XalanDOMString	encoding("UTF-8", theManager);
 
 						XalanFileOutputStream myOutput(theOutputFile, theManager);
 						XalanOutputStreamPrintWriter myResultWriter(myOutput);

Modified: xalan/c/trunk/Tests/Params/Params.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/Tests/Params/Params.cpp?rev=680433&r1=680432&r2=680433&view=diff
==============================================================================
--- xalan/c/trunk/Tests/Params/Params.cpp (original)
+++ xalan/c/trunk/Tests/Params/Params.cpp Mon Jul 28 11:25:22 2008
@@ -226,7 +226,7 @@
 							{
 								const XSLTInputSource	embed07InputSource(theXSLFile);
 								xalan.transform(embed07InputSource, theResultTarget);
-								h.data.testOrFile += XALAN_STATIC_UCODE_STRING(" (Embed01)");
+								h.data.testOrFile += " (Embed01)";
 								embedFlag = true;
 								break;
 							}
@@ -235,7 +235,7 @@
 							{
 								const XSLTInputSource	embed08InputSource(theXSLFile);
 								xalan.transform(embed08InputSource, theResultTarget);
-								h.data.testOrFile += XALAN_STATIC_UCODE_STRING(" (Embed02)");
+								h.data.testOrFile += " (Embed02)";
 								embedFlag = true;
 								break;
 							}

Modified: xalan/c/trunk/Tests/PerfT/perft.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/Tests/PerfT/perft.cpp?rev=680433&r1=680432&r2=680433&view=diff
==============================================================================
--- xalan/c/trunk/Tests/PerfT/perft.cpp (original)
+++ xalan/c/trunk/Tests/PerfT/perft.cpp Mon Jul 28 11:25:22 2008
@@ -135,7 +135,7 @@
 
 	bool setGold = false;
 
-	const XalanDOMString	processorType(XALAN_STATIC_UCODE_STRING("XalanC"));
+	const XalanDOMString	processorType("XalanC");
 
 	if (h.getParams(argc, argv, "PERFT-RESULTS", setGold) == true)
 	{

Modified: xalan/c/trunk/Tests/Threads/ThreadTest.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/Tests/Threads/ThreadTest.cpp?rev=680433&r1=680432&r2=680433&view=diff
==============================================================================
--- xalan/c/trunk/Tests/Threads/ThreadTest.cpp (original)
+++ xalan/c/trunk/Tests/Threads/ThreadTest.cpp Mon Jul 28 11:25:22 2008
@@ -269,11 +269,7 @@
 // theProcessor.setStylesheetRoot method. The transform is done using the theProcessor's
 // process() method.
 
-#if defined(XALAN_OLD_STYLE_CASTS)
-	ThreadInfo* const		theInfo = (ThreadInfo*)param;
-#else
 	ThreadInfo* const		theInfo = reinterpret_cast<ThreadInfo*>(param);
-#endif
 
 	assert(theInfo != 0);
 
@@ -293,7 +289,7 @@
 		// from same directory as the input files.
 
 		// Generate the output file name.
-		XalanDOMString	theOutputFile(XALAN_STATIC_UCODE_STRING("birds"), theManager);
+		XalanDOMString	theOutputFile("birds", theManager);
 
 		NumberToDOMString(theInfo->m_threadNumber, theOutputFile);
         theOutputFile.append(".out");
@@ -340,11 +336,7 @@
 {
 // This routine compiles a stylesheet and a source document
 
-#if defined(XALAN_OLD_STYLE_CASTS)
-	ThreadInfo* const		theInfo = (ThreadInfo*)param;
-#else
 	ThreadInfo* const		theInfo = reinterpret_cast<ThreadInfo*>(param);
-#endif
 
 	assert(theInfo != 0);
 
@@ -364,7 +356,7 @@
         MemoryManagerType& theManager = XalanMemMgrs::getDefaultXercesMemMgr();
 
         // Generate the output file name.
-        XalanDOMString	theOutputFile(XALAN_STATIC_UCODE_STRING("birds"), theManager);
+        XalanDOMString	theOutputFile("birds", theManager);
 
 		NumberToDOMString(theInfo->m_threadNumber, theOutputFile);
         theOutputFile.append(".out");

Modified: xalan/c/trunk/samples/DocumentBuilder/DocumentBuilder.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/samples/DocumentBuilder/DocumentBuilder.cpp?rev=680433&r1=680432&r2=680433&view=diff
==============================================================================
--- xalan/c/trunk/samples/DocumentBuilder/DocumentBuilder.cpp (original)
+++ xalan/c/trunk/samples/DocumentBuilder/DocumentBuilder.cpp Mon Jul 28 11:25:22 2008
@@ -76,25 +76,25 @@
 	theContentHandler->startDocument();
 
 	// start the document element...
-	theElementName = XALAN_STATIC_UCODE_STRING("foo");
+	theElementName = "foo";
 
 	theContentHandler->startElement(&theEmptyString, &theEmptyString, c_wstr(theElementName), theAttributes);
 
 	// Create an element child...
 
 	// Set the name of the element...
-	theElementName = XALAN_STATIC_UCODE_STRING("foobar");
+	theElementName = "foobar";
 
 	// Add an attribute...
-	theAttributeName = XALAN_STATIC_UCODE_STRING("attribute1");
-	theAttributeValue = XALAN_STATIC_UCODE_STRING("value1");
+	theAttributeName = "attribute1";
+	theAttributeValue = "value1";
 
 	theAttributes.addAttribute(c_wstr(theAttributeName), c_wstr(theAttributeType), c_wstr(theAttributeValue));
 
 	theContentHandler->startElement(&theEmptyString, &theEmptyString, c_wstr(theElementName), theAttributes);
 
 	// Add a text node...
-	theTextValue = XALAN_STATIC_UCODE_STRING("The first foobar");
+	theTextValue = "The first foobar";
 
 	theContentHandler->characters(c_wstr(theTextValue), length(theTextValue));
 
@@ -102,31 +102,31 @@
 	theContentHandler->endElement(&theEmptyString, &theEmptyString, c_wstr(theElementName));
 
 	theAttributes.clear();
-	theAttributeName = XALAN_STATIC_UCODE_STRING("attribute2");
-	theAttributeValue = XALAN_STATIC_UCODE_STRING("value2");
+	theAttributeName = "attribute2";
+	theAttributeValue = "value2";
 	theAttributes.addAttribute(c_wstr(theAttributeName), c_wstr(theAttributeType), c_wstr(theAttributeValue));
 
 	theContentHandler->startElement(&theEmptyString, &theEmptyString, c_wstr(theElementName), theAttributes);
 
-	theTextValue = XALAN_STATIC_UCODE_STRING("The second foobar");
+	theTextValue = "The second foobar";
 	theContentHandler->characters(c_wstr(theTextValue), length(theTextValue));
 
 	theContentHandler->endElement(&theEmptyString, &theEmptyString, c_wstr(theElementName));
 
 	theAttributes.clear();
-	theAttributeName = XALAN_STATIC_UCODE_STRING("attribute3");
-	theAttributeValue = XALAN_STATIC_UCODE_STRING("value3");
+	theAttributeName = "attribute3";
+	theAttributeValue = "value3";
 	theAttributes.addAttribute(c_wstr(theAttributeName), c_wstr(theAttributeType), c_wstr(theAttributeValue));
 
 	theContentHandler->startElement(&theEmptyString, &theEmptyString, c_wstr(theElementName), theAttributes);
 
-	theTextValue = XALAN_STATIC_UCODE_STRING("The third foobar");
+	theTextValue = "The third foobar";
 	theContentHandler->characters(c_wstr(theTextValue), length(theTextValue));
 
 	theContentHandler->endElement(&theEmptyString, &theEmptyString, c_wstr(theElementName));
 
 	// end the document element...
-	theElementName = XALAN_STATIC_UCODE_STRING("foo");
+	theElementName = "foo";
 
 	theContentHandler->endElement(&theEmptyString, &theEmptyString, c_wstr(theElementName));
 

Modified: xalan/c/trunk/samples/XalanTransformerCallback/XalanTransformerCallback.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/samples/XalanTransformerCallback/XalanTransformerCallback.cpp?rev=680433&r1=680432&r2=680433&view=diff
==============================================================================
--- xalan/c/trunk/samples/XalanTransformerCallback/XalanTransformerCallback.cpp (original)
+++ xalan/c/trunk/samples/XalanTransformerCallback/XalanTransformerCallback.cpp Mon Jul 28 11:25:22 2008
@@ -81,11 +81,7 @@
 			CallbackSizeType	theLength,
 			void*				theHandle)
 {
-#if defined(XALAN_OLD_STYLE_CASTS)
-	return ((CallbackHandler*)theHandle)->write(theData, theLength);
-#else
 	return reinterpret_cast<CallbackHandler*>(theHandle)->write(theData, theLength);
-#endif
 }
 
 // This is the flush callback function, which casts the handle
@@ -94,11 +90,7 @@
 void
 flushCallback(void*	theHandle)
 {
-#if defined(XALAN_OLD_STYLE_CASTS)
-	((CallbackHandler*)theHandle)->flush();
-#else
 	reinterpret_cast<CallbackHandler*>(theHandle)->flush();
-#endif
 }
 
 }

Modified: xalan/c/trunk/src/xalanc/DOMSupport/DOMServices.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/DOMSupport/DOMServices.cpp?rev=680433&r1=680432&r2=680433&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/DOMSupport/DOMServices.cpp (original)
+++ xalan/c/trunk/src/xalanc/DOMSupport/DOMServices.cpp Mon Jul 28 11:25:22 2008
@@ -165,11 +165,8 @@
 	case XalanNode::DOCUMENT_FRAGMENT_NODE:
 		{
 			const XalanDocumentFragment&		theDocumentFragment =
-#if defined(XALAN_OLD_STYLE_CASTS)
-				(const XalanDocumentFragment&)node;
-#else
 				static_cast<const XalanDocumentFragment&>(node);
-#endif
+
 			getNodeData(theDocumentFragment, data);
 		}
 		break;
@@ -177,11 +174,8 @@
 	case XalanNode::DOCUMENT_NODE:
 		{
 			const XalanDocument&	theDocument =
-#if defined(XALAN_OLD_STYLE_CASTS)
-				(const XalanDocument&)node;
-#else
 				static_cast<const XalanDocument&>(node);
-#endif
+
 			getNodeData(theDocument, data);
 		}
 		break;
@@ -189,11 +183,8 @@
 	case XalanNode::ELEMENT_NODE:
 		{
 			const XalanElement&		theElement =
-#if defined(XALAN_OLD_STYLE_CASTS)
-				(const XalanElement&)node;
-#else
 				static_cast<const XalanElement&>(node);
-#endif
+
 			getNodeData(theElement, data);
 		}
 		break;
@@ -202,11 +193,7 @@
 	case XalanNode::CDATA_SECTION_NODE:
 		{
 			const XalanText&	theTextNode =
-#if defined(XALAN_OLD_STYLE_CASTS)
-				(const XalanText&)node;
-#else
 				static_cast<const XalanText&>(node);
-#endif
 
 				getNodeData(theTextNode, data);
 		}
@@ -215,11 +202,8 @@
 	case XalanNode::ATTRIBUTE_NODE:
 		{
 			const XalanAttr&		theAttr =
-#if defined(XALAN_OLD_STYLE_CASTS)
-				(const XalanAttr&)node;
-#else
 				static_cast<const XalanAttr&>(node);
-#endif
+
 			getNodeData(theAttr, data);
 		}
 		break;
@@ -227,11 +211,8 @@
 	case XalanNode::COMMENT_NODE:
 		{
 			const XalanComment&		theComment =
-#if defined(XALAN_OLD_STYLE_CASTS)
-				(const XalanComment&)node;
-#else
 				static_cast<const XalanComment&>(node);
-#endif
+
 			getNodeData(theComment, data);
 		}
 		break;
@@ -239,11 +220,8 @@
 	case XalanNode::PROCESSING_INSTRUCTION_NODE:
 		{
 			const XalanProcessingInstruction&		thePI =
-#if defined(XALAN_OLD_STYLE_CASTS)
-				(const XalanProcessingInstruction&)node;
-#else
 				static_cast<const XalanProcessingInstruction&>(node);
-#endif
+
 			getNodeData(thePI, data);
 		}
 		break;
@@ -267,11 +245,7 @@
 	if (theType == XalanNode::ELEMENT_NODE)
 	{
 		const XalanElement*	const	theElementNode =
-#if defined(XALAN_OLD_STYLE_CASTS)
-				(const XalanElement*)child;
-#else
 				static_cast<const XalanElement*>(child);
-#endif
 
 		DOMServices::getNodeData(*theElementNode, data);
 	}
@@ -279,11 +253,7 @@
 			 theType == XalanNode::CDATA_SECTION_NODE)
 	{
 		const XalanText*	theTextNode =
-#if defined(XALAN_OLD_STYLE_CASTS)
-				(const XalanText*)child;
-#else
 				static_cast<const XalanText*>(child);
-#endif
 
 		DOMServices::getNodeData(*theTextNode, data);
 	}
@@ -357,11 +327,8 @@
 	case XalanNode::DOCUMENT_FRAGMENT_NODE:
 		{
 			const XalanDocumentFragment&		theDocumentFragment =
-#if defined(XALAN_OLD_STYLE_CASTS)
-				(const XalanDocumentFragment&)node;
-#else
 				static_cast<const XalanDocumentFragment&>(node);
-#endif
+
 			getNodeData(theDocumentFragment, formatterListener, function);
 		}
 		break;
@@ -369,11 +336,8 @@
 	case XalanNode::DOCUMENT_NODE:
 		{
 			const XalanDocument&	theDocument =
-#if defined(XALAN_OLD_STYLE_CASTS)
-				(const XalanDocument&)node;
-#else
 				static_cast<const XalanDocument&>(node);
-#endif
+
 			getNodeData(theDocument, formatterListener, function);
 		}
 		break;
@@ -381,11 +345,8 @@
 	case XalanNode::ELEMENT_NODE:
 		{
 			const XalanElement&		theElement =
-#if defined(XALAN_OLD_STYLE_CASTS)
-				(const XalanElement&)node;
-#else
 				static_cast<const XalanElement&>(node);
-#endif
+
 			getNodeData(theElement, formatterListener, function);
 		}
 		break;
@@ -394,11 +355,7 @@
 	case XalanNode::CDATA_SECTION_NODE:
 		{
 			const XalanText&	theTextNode =
-#if defined(XALAN_OLD_STYLE_CASTS)
-				(const XalanText&)node;
-#else
 				static_cast<const XalanText&>(node);
-#endif
 
 				getNodeData(theTextNode, formatterListener, function);
 		}
@@ -407,11 +364,8 @@
 	case XalanNode::ATTRIBUTE_NODE:
 		{
 			const XalanAttr&		theAttr =
-#if defined(XALAN_OLD_STYLE_CASTS)
-				(const XalanAttr&)node;
-#else
 				static_cast<const XalanAttr&>(node);
-#endif
+
 			getNodeData(theAttr, formatterListener, function);
 		}
 		break;
@@ -419,11 +373,8 @@
 	case XalanNode::COMMENT_NODE:
 		{
 			const XalanComment&		theComment =
-#if defined(XALAN_OLD_STYLE_CASTS)
-				(const XalanComment&)node;
-#else
 				static_cast<const XalanComment&>(node);
-#endif
+
 			getNodeData(theComment, formatterListener, function);
 		}
 		break;
@@ -431,11 +382,8 @@
 	case XalanNode::PROCESSING_INSTRUCTION_NODE:
 		{
 			const XalanProcessingInstruction&		thePI =
-#if defined(XALAN_OLD_STYLE_CASTS)
-				(const XalanProcessingInstruction&)node;
-#else
 				static_cast<const XalanProcessingInstruction&>(node);
-#endif
+
 			getNodeData(thePI, formatterListener, function);
 		}
 		break;
@@ -459,11 +407,7 @@
 	if (theType == XalanNode::ELEMENT_NODE)
 	{
 		const XalanElement*	const	theElementNode =
-#if defined(XALAN_OLD_STYLE_CASTS)
-				(const XalanElement*)child;
-#else
 				static_cast<const XalanElement*>(child);
-#endif
 
 		DOMServices::getNodeData(*theElementNode, formatterListener, function);
 	}
@@ -471,11 +415,7 @@
 			 theType == XalanNode::CDATA_SECTION_NODE)
 	{
 		const XalanText*	theTextNode =
-#if defined(XALAN_OLD_STYLE_CASTS)
-				(const XalanText*)child;
-#else
 				static_cast<const XalanText*>(child);
-#endif
 
 		DOMServices::getNodeData(*theTextNode, formatterListener, function);
 	}
@@ -545,21 +485,11 @@
 
 	if (theNodeType == XalanNode::ATTRIBUTE_NODE)
 	{
-		return getNameOfNode(
-#if defined(XALAN_OLD_STYLE_CASTS)
-				(const XalanAttr&)n);
-#else
-				static_cast<const XalanAttr&>(n));
-#endif
+		return getNameOfNode(static_cast<const XalanAttr&>(n));
 	}
 	else if (theNodeType == XalanNode::ELEMENT_NODE)
 	{
-		return getNameOfNode(
-#if defined(XALAN_OLD_STYLE_CASTS)
-				(const XalanElement&)n);
-#else
-				static_cast<const XalanElement&>(n));
-#endif
+		return getNameOfNode(static_cast<const XalanElement&>(n));
 	}
 	else if (theNodeType == XalanNode::PROCESSING_INSTRUCTION_NODE)
 	{

Modified: xalan/c/trunk/src/xalanc/DOMSupport/DOMServices.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/DOMSupport/DOMServices.hpp?rev=680433&r1=680432&r2=680433&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/DOMSupport/DOMServices.hpp (original)
+++ xalan/c/trunk/src/xalanc/DOMSupport/DOMServices.hpp Mon Jul 28 11:25:22 2008
@@ -438,11 +438,7 @@
 	{
 		if(node.getNodeType() == XalanNode::ATTRIBUTE_NODE)
 		{
-#if defined(XALAN_OLD_STYLE_CASTS)
-			return ((const XalanAttr&)node).getOwnerElement();
-#else
 			return static_cast<const XalanAttr&>(node).getOwnerElement();
-#endif
 		}
 		else
 		{

Modified: xalan/c/trunk/src/xalanc/DOMSupport/XalanDocumentPrefixResolver.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/DOMSupport/XalanDocumentPrefixResolver.cpp?rev=680433&r1=680432&r2=680433&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/DOMSupport/XalanDocumentPrefixResolver.cpp (original)
+++ xalan/c/trunk/src/xalanc/DOMSupport/XalanDocumentPrefixResolver.cpp Mon Jul 28 11:25:22 2008
@@ -128,11 +128,7 @@
 	case XalanNode::ELEMENT_NODE:
 		{
 			const XalanElement*	theElementNode =
-#if defined(XALAN_OLD_STYLE_CASTS)
-				(const XalanElement*)node;
-#else
 				static_cast<const XalanElement*>(node);
-#endif
 
 			const XalanNamedNodeMap* const	atts = theElementNode->getAttributes();
 			assert(atts != 0);
@@ -144,11 +140,7 @@
 				assert(atts->item(i) != 0 && atts->item(i)->getNodeType() == XalanNode::ATTRIBUTE_NODE);
 
 				const XalanAttr* const	theAttr =
-#if defined(XALAN_OLD_STYLE_CASTS)
-					(const XalanAttr*)atts->item(i);
-#else
 					static_cast<const XalanAttr*>(atts->item(i));
-#endif
 
 				if (DOMServices::isNamespaceDeclaration(*theAttr) == true)
 				{
@@ -173,11 +165,7 @@
 {
 	assert(node != 0);
 
-#if defined(XALAN_OLD_STYLE_CASTS)
-	return startNode((const XalanNode*)node);
-#else
 	return startNode(const_cast<const XalanNode*>(node));
-#endif
 }
 
 

Modified: xalan/c/trunk/src/xalanc/Harness/XalanFileUtility.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Harness/XalanFileUtility.cpp?rev=680433&r1=680432&r2=680433&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Harness/XalanFileUtility.cpp (original)
+++ xalan/c/trunk/src/xalanc/Harness/XalanFileUtility.cpp Mon Jul 28 11:25:22 2008
@@ -441,7 +441,7 @@
     char buffer3[PATH_MAX];
     getcwd(buffer3, PATH_MAX);
 
-    const XalanDOMString    searchSuffix(XALAN_STATIC_UCODE_STRING("*.xsl"), getMemoryManager());
+    const XalanDOMString    searchSuffix("*.xsl", getMemoryManager());
     XalanDOMString  searchSpecification(getMemoryManager());
 
     // Allow directory search w/o mandating files start with directory name. Required for files
@@ -487,7 +487,7 @@
     char buffer2[PATH_MAX];
     getcwd(buffer2, PATH_MAX);
 
-    const XalanDOMString    dirSpec(XALAN_STATIC_UCODE_STRING("*"), getMemoryManager());
+    const XalanDOMString    dirSpec("*", getMemoryManager());
 
     DirectoryEnumeratorFunctor<
         FileNameVectorType,

Modified: xalan/c/trunk/src/xalanc/ICUBridge/ICUBridge.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/ICUBridge/ICUBridge.cpp?rev=680433&r1=680432&r2=680433&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/ICUBridge/ICUBridge.cpp (original)
+++ xalan/c/trunk/src/xalanc/ICUBridge/ICUBridge.cpp Mon Jul 28 11:25:22 2008
@@ -40,28 +40,6 @@
 
 
 
-#if defined(XALAN_XALANDOMCHAR_USHORT_MISMATCH)
-inline void
-doCopyData(
-			const XalanDOMChar*		    theString,
-			XalanDOMString::size_type   theStringLength,
-			XalanDOMChar*			    theBuffer)
-{
-	// Copy the data, truncating each character...
-	for (XalanDOMString::size_type i = 0; i < theStringLength; ++i)
-	{
-		// There should be no truncation, since XalanDOMChars
-		// hold UTF-16 code points, but assert, just in case...
-		assert(theString[i] == UChar(theString[i]));
-
-		theBuffer[i] = theString[i];
-	}
-
-}
-#endif
-
-
-
 // Use a stack-based buffer up to this size.
 const XalanSize_t	theStackBufferSize = 200u;
 
@@ -83,20 +61,11 @@
 }
 
 
-#if defined(XALAN_XALANDOMCHAR_USHORT_MISMATCH)
-
-const UnicodeString
-ICUBridge::XalanDOMCharStringToUnicodeString(
-            MemoryManagerType&          theManager,
-			const XalanDOMChar*			theString,
-			XalanDOMString::size_type	theLength)
-#else
 const UnicodeString
 ICUBridge::XalanDOMCharStringToUnicodeString(
             MemoryManagerType&        /*  theManager */,
 			const XalanDOMChar*			theString,
 			XalanDOMString::size_type	theLength)
-#endif
 {
 	assert(theString != 0);
 
@@ -106,41 +75,7 @@
 	}
 	else
 	{
-#if defined(XALAN_XALANDOMCHAR_USHORT_MISMATCH)
-
-		if (theStackBufferSize > theLength)
-		{
-			XalanDOMChar	theBuffer[theStackBufferSize];
-
-			doCopyData(theString, theLength, theBuffer);
-
-#if U_SIZEOF_WCHAR_T==2
-			return UnicodeString((wchar_t*)&theBuffer[0], theLength);
-#else
-			return UnicodeString(&theBuffer[0], theLength);
-#endif
-		}
-		else
-		{
-			// Create a buffer to copy out the UnicodeString data...
-			UCharVectorType		theBuffer(theManager);
-
-			// Resize the buffer appropriately...
-			theBuffer.resize(theLength);		
-
-#if U_SIZEOF_WCHAR_T==2
-			doCopyData(theString, theLength, (XalanDOMChar*)&theBuffer[0]);
-#else
-			doCopyData(theString, theLength, &theBuffer[0]);
-#endif
-
-			assert(theLength == theBuffer.size());
-
-			return UnicodeString(&theBuffer[0], theLength);
-		}
-#else
 		return UnicodeString(theString, length(theString));
-#endif
 	}
 }
 
@@ -164,27 +99,6 @@
 {
 	const int32_t	theLength = theString.length();
 
-#if defined(XALAN_XALANDOMCHAR_USHORT_MISMATCH)
-
-	// If XalanDOMChar is larger than the ICU's UChar, we have to more work...
-	// Create a buffer...
-    XalanDOMCharVectorType	theBuffer(theResult.getMemoryManager());
-
-	// Reserve the appropriate amount of space...
-	theBuffer.reserve(theLength);
-
-	// Copy the data...
-	for (int32_t i = 0; i < theLength; ++i)
-	{
-		theBuffer.push_back(theString[i]);
-	}
-
-    theResult.assign(&theBuffer[0], theBuffer.size());
-
-	return theResult;
-
-#else
-
 	if (theStackBufferSize > theLength)
 	{
 		UChar	theBuffer[theStackBufferSize];
@@ -213,7 +127,6 @@
 
 		return theResult;
 	}
-#endif
 }
 
 

Modified: xalan/c/trunk/src/xalanc/ICUBridge/ICUBridgeCollationCompareFunctorImpl.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/ICUBridge/ICUBridgeCollationCompareFunctorImpl.cpp?rev=680433&r1=680432&r2=680433&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/ICUBridge/ICUBridgeCollationCompareFunctorImpl.cpp (original)
+++ xalan/c/trunk/src/xalanc/ICUBridge/ICUBridgeCollationCompareFunctorImpl.cpp Mon Jul 28 11:25:22 2008
@@ -150,19 +150,11 @@
 			const XalanDOMChar*		theLHS,
 			const XalanDOMChar*		theRHS) const
 {
-#if defined(XALAN_USE_WCHAR_CAST_HACK)
-	return theCollator.compare(
-				(const wchar_t*)theLHS,
-				length(theLHS),
-				(const wchar_t*)theRHS,
-				length(theRHS));
-#else
 	return theCollator.compare(
 				theLHS,
 				length(theLHS),
 				theRHS,
 				length(theRHS));
-#endif
 }
 
 
@@ -341,19 +333,11 @@
 				caseOrderConvert(theCaseOrder),
 				theStatus);
 
-#if defined(XALAN_USE_WCHAR_CAST_HACK)
-	return theCollator.compare(
-					(const wchar_t*)theLHS,
-					length(theLHS),
-					(const wchar_t*)theRHS,
-					length(theRHS));
-#else
 	return theCollator.compare(
 					theLHS,
 					length(theLHS),
 					theRHS,
 					length(theRHS));
-#endif
 }
 
 
@@ -409,20 +393,13 @@
 {
 	XALAN_USING_STD(find_if)
 
-	CollatorCacheListType&		theNonConstCache =
-#if defined(XALAN_NO_MUTABLE)
-		(CollatorCacheListType&)m_collatorCache;
-#else
-		m_collatorCache;
-#endif
-
 	CollatorCacheListType::iterator	i =
 		find_if(
-			theNonConstCache.begin(),
-			theNonConstCache.end(),
+			m_collatorCache.begin(),
+			m_collatorCache.end(),
 			CollationCacheStruct::CollatorFindFunctor(theLocale));
 
-	if (i == theNonConstCache.end())
+	if (i == m_collatorCache.end())
 	{
 		return 0;
 	}
@@ -432,7 +409,7 @@
 		// If so, we don't have to update the cache, so just return the
 		// appropriate value...
 		const CollatorCacheListType::iterator	theBegin =
-			theNonConstCache.begin();
+			m_collatorCache.begin();
 
 		if (i == theBegin)
 		{
@@ -445,7 +422,7 @@
 			CollatorType* const		theCollator = (*i).m_collator;
 
 			// Move the entry to the beginning the cache
-			theNonConstCache.splice(theBegin, theNonConstCache, i);
+			m_collatorCache.splice(theBegin, m_collatorCache, i);
 
 			return theCollator;
 		}
@@ -462,26 +439,19 @@
 	assert(theCollator != 0);
 	assert(theLocale != 0);
 
-	CollatorCacheListType&		theNonConstCache =
-#if defined(XALAN_NO_MUTABLE)
-		(CollatorCacheListType&)m_collatorCache;
-#else
-		m_collatorCache;
-#endif
-
 	// Is the cache full?
-	if (theNonConstCache.size() == eCacheMax)
+	if (m_collatorCache.size() == eCacheMax)
 	{
 		// Yes, so guard the collator instance, in case pop_back() throws...
-		XalanAutoPtr<CollatorType>	theCollatorGuard(theNonConstCache.back().m_collator);
+		XalanAutoPtr<CollatorType>	theCollatorGuard(m_collatorCache.back().m_collator);
 
-		theNonConstCache.pop_back();
+		m_collatorCache.pop_back();
 	}
 
-	theNonConstCache.push_front(CollatorCacheListType::value_type(getMemoryManager()));
+	m_collatorCache.push_front(CollatorCacheListType::value_type(getMemoryManager()));
 
 	CollatorCacheListType::value_type&		theEntry = 
-		theNonConstCache.front();
+		m_collatorCache.front();
 
 	// Set the locale first, since that might throw an exception...
 	theEntry.m_locale = theLocale;

Modified: xalan/c/trunk/src/xalanc/ICUBridge/ICUFormatNumberFunctor.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/ICUBridge/ICUFormatNumberFunctor.cpp?rev=680433&r1=680432&r2=680433&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/ICUBridge/ICUFormatNumberFunctor.cpp (original)
+++ xalan/c/trunk/src/xalanc/ICUBridge/ICUFormatNumberFunctor.cpp Mon Jul 28 11:25:22 2008
@@ -117,20 +117,13 @@
 {
     XALAN_USING_STD(find_if)
 
-    DecimalFormatCacheListType&     theNonConstCache =
-#if defined(XALAN_NO_MUTABLE)
-        (DecimalFormatCacheListType&)m_decimalFormatCache;
-#else
-        m_decimalFormatCache;
-#endif
-
     DecimalFormatCacheListType::iterator i =
         find_if(
-            theNonConstCache.begin(),
-            theNonConstCache.end(),
+            m_decimalFormatCache.begin(),
+            m_decimalFormatCache.end(),
             DecimalFormatCacheStruct::DecimalFormatFindFunctor(&theDFS));
 
-    if (i == theNonConstCache.end())
+    if (i == m_decimalFormatCache.end())
     {
         return 0;
     }
@@ -140,7 +133,7 @@
         // If so, we don't have to update the cache, so just return the
         // appropriate value...
         const DecimalFormatCacheListType::iterator  theBegin =
-            theNonConstCache.begin();
+            m_decimalFormatCache.begin();
 
         if (i == theBegin)
         {
@@ -149,11 +142,11 @@
         else
         {
             // Save the formatter, because splice() may invalidate
-            // i.
+            // the iterator.
             DecimalFormatType* const    theFormatter = (*i).m_formatter;
 
             // Move the entry to the beginning the cache
-            theNonConstCache.splice(theBegin, theNonConstCache, i);
+            m_decimalFormatCache.splice(theBegin, m_decimalFormatCache, i);
 
             return theFormatter;
         }
@@ -333,30 +326,23 @@
 
     assert(theFormatter != 0);
 
-    DecimalFormatCacheListType&     theNonConstCache =
-#if defined(XALAN_NO_MUTABLE)
-        (DecimalFormatCacheListType&)m_decimalFormatCache;
-#else
-        m_decimalFormatCache;
-#endif
-
     // Is the cache full?
-    if (theNonConstCache.size() == eCacheMax)
+    if (m_decimalFormatCache.size() == eCacheMax)
     {
         // Yes, so guard the collator instance, in case pop_back() throws...
         DFAutoPtrType   theDecimalFormatGuard(
                             m_memoryManager,
-                            theNonConstCache.back().m_formatter);
+                            m_decimalFormatCache.back().m_formatter);
 
-        theNonConstCache.pop_back();
+        m_decimalFormatCache.pop_back();
     }
 
     const DecimalFormatCacheListType::value_type    emptyDFC(m_memoryManager);
 
-    theNonConstCache.push_front(emptyDFC);
+    m_decimalFormatCache.push_front(emptyDFC);
 
     DecimalFormatCacheListType::value_type&     theEntry = 
-        theNonConstCache.front();
+        m_decimalFormatCache.front();
 
     theEntry.m_formatter = theFormatter;
     theEntry.m_DFS = theDFS;

Modified: xalan/c/trunk/src/xalanc/Include/AIXDefinitions.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Include/AIXDefinitions.hpp?rev=680433&r1=680432&r2=680433&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Include/AIXDefinitions.hpp (original)
+++ xalan/c/trunk/src/xalanc/Include/AIXDefinitions.hpp Mon Jul 28 11:25:22 2008
@@ -34,49 +34,13 @@
 #define XALAN_PLATFORM_IMPORT_FUNCTION(T) T XALAN_PLATFORM_IMPORT
 
 
-#define XALAN_LSTRSUPPORT
-#if !defined(XML_BITSTOBUILD_64)
-#define XALAN_USE_WCHAR_CAST_HACK
-#endif
 #define XALAN_POSIX2_AVAILABLE
-#define XALAN_XALANDOMCHAR_USHORT_MISMATCH
-
-#if __IBMCPP__ > 366
-
 #define XALAN_EXPLICIT_SCOPE_IN_TEMPLATE_BUG
 #define XALAN_NEW_STD_ALLOCATOR
 #define XALAN_HAS_CPP_NAMESPACE
 #define XALAN_HAS_STD_ITERATORS
 #define XALAN_HAS_STD_DISTANCE
 
-#else
-
-#define XALAN_OLD_STYLE_CASTS
-#define XALAN_CLASSIC_IOSTREAMS
-#define XALAN_NO_STD_NAMESPACE
-#define XALAN_NO_MUTABLE
-#define XALAN_SGI_BASED_STL
-#define XALAN_NO_MEMBER_TEMPLATES
-#define XALAN_AMBIGUOUS_EVEN_IF_NOT_CALLED
-#define XALAN_CANNOT_DELETE_CONST
-#define XALAN_BOOL_AS_INT
-#define XALAN_NO_STD_ALLOCATORS
-#define XALAN_NO_SELECTIVE_TEMPLATE_INSTANTIATION
-#define XALAN_NO_ALGORITHMS_WITH_BUILTINS
-#define XALAN_NO_DEFAULT_TEMPLATE_ARGUMENTS
-#define XALAN_NO_COVARIANT_RETURN_TYPE
-#define XALAN_AUTO_PTR_REQUIRES_DEFINITION
-#define XALAN_NEEDS_EXPLICIT_TEMPLATE_INSTANTIATION
-#define XALAN_STLPORT_STL
-#define XALAN_TEMPLATE_FUNCTION_NO_DEFAULT_PARAMETERS
-#define XALAN_NO_USING_DECLARATION
-
-// STL Port Definitions
-#define _REENTRANT
-#define __STL_NO_SGI_IOSTREAMS
-#include <stl/_config.h>
-
-#endif
 
 
 #endif	// AIXDEFINITIONS_HEADER_GUARD_1357924680

Modified: xalan/c/trunk/src/xalanc/Include/GCCDefinitions.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Include/GCCDefinitions.hpp?rev=680433&r1=680432&r2=680433&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Include/GCCDefinitions.hpp (original)
+++ xalan/c/trunk/src/xalanc/Include/GCCDefinitions.hpp Mon Jul 28 11:25:22 2008
@@ -41,7 +41,6 @@
 #endif
 
 #define XALAN_SGI_BASED_STL
-#define XALAN_XALANDOMCHAR_USHORT_MISMATCH
 #define XALAN_POSIX2_AVAILABLE
 #define XALAN_INLINE_INITIALIZATION
 #define XALAN_HAS_CPP_NAMESPACE

Modified: xalan/c/trunk/src/xalanc/Include/HPUXDefinitions.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Include/HPUXDefinitions.hpp?rev=680433&r1=680432&r2=680433&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Include/HPUXDefinitions.hpp (original)
+++ xalan/c/trunk/src/xalanc/Include/HPUXDefinitions.hpp Mon Jul 28 11:25:22 2008
@@ -46,7 +46,6 @@
 #endif
 
 #define XALAN_HAS_CPP_NAMESPACE
-#define XALAN_XALANDOMCHAR_USHORT_MISMATCH
 #define XALAN_POSIX2_AVAILABLE
 #define XALAN_INLINE_INITIALIZATION
 

Modified: xalan/c/trunk/src/xalanc/Include/IntelDefinitions.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Include/IntelDefinitions.hpp?rev=680433&r1=680432&r2=680433&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Include/IntelDefinitions.hpp (original)
+++ xalan/c/trunk/src/xalanc/Include/IntelDefinitions.hpp Mon Jul 28 11:25:22 2008
@@ -36,7 +36,6 @@
 #define XALAN_HAS_STD_ITERATORS
 #define XALAN_HAS_STD_DISTANCE
 #define XALAN_HAS_CPP_NAMESPACE
-#define XALAN_XALANDOMCHAR_USHORT_MISMATCH
 #define XALAN_POSIX2_AVAILABLE
 #define XALAN_INLINE_INITIALIZATION
 

Modified: xalan/c/trunk/src/xalanc/Include/OS390Definitions.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Include/OS390Definitions.hpp?rev=680433&r1=680432&r2=680433&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Include/OS390Definitions.hpp (original)
+++ xalan/c/trunk/src/xalanc/Include/OS390Definitions.hpp Mon Jul 28 11:25:22 2008
@@ -33,9 +33,6 @@
 #define XALAN_PLATFORM_EXPORT_FUNCTION(T) T XALAN_PLATFORM_EXPORT
 #define XALAN_PLATFORM_IMPORT_FUNCTION(T) T XALAN_PLATFORM_IMPORT
 
-#define XALAN_XALANDOMCHAR_USHORT_MISMATCH
-#define XALAN_USE_WCHAR_CAST_HACK
-#define XALAN_USE_XERCES_LOCAL_CODEPAGE_TRANSCODERS
 #define XALAN_NON_ASCII_PLATFORM
 
 #define XALAN_EXPLICIT_SCOPE_IN_TEMPLATE_BUG

Modified: xalan/c/trunk/src/xalanc/Include/OS400Definitions.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Include/OS400Definitions.hpp?rev=680433&r1=680432&r2=680433&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Include/OS400Definitions.hpp (original)
+++ xalan/c/trunk/src/xalanc/Include/OS400Definitions.hpp Mon Jul 28 11:25:22 2008
@@ -33,47 +33,11 @@
 #define XALAN_PLATFORM_IMPORT_FUNCTION(T) T XALAN_PLATFORM_IMPORT
 
 
-#define XALAN_LSTRSUPPORT
-#if !defined(XML_BITSTOBUILD_64)
-#define XALAN_USE_WCHAR_CAST_HACK
-#endif
 #define XALAN_POSIX2_AVAILABLE
-#define XALAN_XALANDOMCHAR_USHORT_MISMATCH
-
-#if __IBMCPP__ > 366
-
 #define XALAN_EXPLICIT_SCOPE_IN_TEMPLATE_BUG
 #define XALAN_NEW_STD_ALLOCATOR
 #define XALAN_HAS_CPP_NAMESPACE
 
-#else
-
-#define XALAN_OLD_STYLE_CASTS
-#define XALAN_CLASSIC_IOSTREAMS
-#define XALAN_NO_STD_NAMESPACE
-#define XALAN_NO_MUTABLE
-#define XALAN_SGI_BASED_STL
-#define XALAN_NO_MEMBER_TEMPLATES
-#define XALAN_AMBIGUOUS_EVEN_IF_NOT_CALLED
-#define XALAN_CANNOT_DELETE_CONST
-#define XALAN_BOOL_AS_INT
-#define XALAN_NO_STD_ALLOCATORS
-#define XALAN_NO_SELECTIVE_TEMPLATE_INSTANTIATION
-#define XALAN_NO_ALGORITHMS_WITH_BUILTINS
-#define XALAN_NO_DEFAULT_TEMPLATE_ARGUMENTS
-#define XALAN_NO_COVARIANT_RETURN_TYPE
-#define XALAN_AUTO_PTR_REQUIRES_DEFINITION
-#define XALAN_NEEDS_EXPLICIT_TEMPLATE_INSTANTIATION
-#define XALAN_STLPORT_STL
-#define XALAN_TEMPLATE_FUNCTION_NO_DEFAULT_PARAMETERS
-#define XALAN_NO_USING_DECLARATION
-
-// STL Port Definitions
-#define _REENTRANT
-#define __STL_NO_SGI_IOSTREAMS
-#include <stl/_config.h>
-
-#endif
 
 
 #endif	// OS400DEFINITIONS_HEADER_GUARD_1357924680

Modified: xalan/c/trunk/src/xalanc/Include/SolarisDefinitions.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Include/SolarisDefinitions.hpp?rev=680433&r1=680432&r2=680433&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Include/SolarisDefinitions.hpp (original)
+++ xalan/c/trunk/src/xalanc/Include/SolarisDefinitions.hpp Mon Jul 28 11:25:22 2008
@@ -32,42 +32,14 @@
 #define XALAN_PLATFORM_IMPORT_FUNCTION(T) T XALAN_PLATFORM_IMPORT
 
 
-#if __SUNPRO_CC >= 0x520
-
 #define XALAN_HAS_CPP_NAMESPACE
 #define XALAN_STRICT_ANSI_HEADERS
 
-#else
-
-// Sun Workshop 4.2 _does_ support new cast syntax, but it's
-// broken with extra cv-qualifiers, so we'll use old-style casts.
-#define XALAN_OLD_STYLE_CASTS
-
-#define XALAN_NO_STD_NAMESPACE
-#define XALAN_STLPORT_STL
-#define XALAN_NO_DEFAULT_BUILTIN_ARRAY_INITIALIZATION
-#define XALAN_CLASSIC_IOSTREAMS
-#define XALAN_NO_MUTABLE
-#define XALAN_SGI_BASED_STL
-#define XALAN_NO_MEMBER_TEMPLATES
-#define XALAN_BOOL_AS_INT
-#define XALAN_NO_DEFAULT_TEMPLATE_ARGUMENTS
-#define XALAN_NO_COVARIANT_RETURN_TYPE
-#define XALAN_NO_USING_DECLARATION
-
-// STL Port Definitions
-#define __STL_NO_SGI_IOSTREAMS
-#define _REENTRANT
-#include <stl/_config.h>
-
-#endif
-
 // Standard allocators don't seem to work correctly with this compiler.
 // I don't know if this is their bug, or ours...
 #define XALAN_NO_STD_ALLOCATORS
 #define XALAN_RW_NO_CLASS_PARTIAL_SPEC
 
-#define XALAN_XALANDOMCHAR_USHORT_MISMATCH
 #define XALAN_POSIX2_AVAILABLE
 #define XALAN_NO_STD_NUMERIC_LIMITS
 

Modified: xalan/c/trunk/src/xalanc/Include/TRU64Definitions.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Include/TRU64Definitions.hpp?rev=680433&r1=680432&r2=680433&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Include/TRU64Definitions.hpp (original)
+++ xalan/c/trunk/src/xalanc/Include/TRU64Definitions.hpp Mon Jul 28 11:25:22 2008
@@ -36,10 +36,8 @@
 // This next line enables standard IO streams.
 #define __USE_STD_IOSTREAM
 #define XALAN_HAS_CPP_NAMESPACE
-#define XALAN_XALANDOMCHAR_USHORT_MISMATCH
 #define XALAN_POSIX2_AVAILABLE
 #define XALAN_INLINE_INITIALIZATION
-#define XALAN_LSTRSUPPORT
 #define XALAN_HAS_STD_ITERATORS
 #define XALAN_HAS_STD_DISTANCE
 #define XALAN_NO_REENTRANT_TIME_FUNCTIONS

Modified: xalan/c/trunk/src/xalanc/Include/VCPPDefinitions.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Include/VCPPDefinitions.hpp?rev=680433&r1=680432&r2=680433&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Include/VCPPDefinitions.hpp (original)
+++ xalan/c/trunk/src/xalanc/Include/VCPPDefinitions.hpp Mon Jul 28 11:25:22 2008
@@ -53,7 +53,6 @@
   #define XALAN_NO_COVARIANT_RETURN_TYPE
 #endif
 
-#define XALAN_LSTRSUPPORT
 #define XALAN_NEWLINE_IS_CRLF
 #define XALAN_HAS_CPP_NAMESPACE
 #define XALAN_HAS_STD_DISTANCE

Modified: xalan/c/trunk/src/xalanc/Include/XalanMemMgrHelper.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Include/XalanMemMgrHelper.hpp?rev=680433&r1=680432&r2=680433&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Include/XalanMemMgrHelper.hpp (original)
+++ xalan/c/trunk/src/xalanc/Include/XalanMemMgrHelper.hpp Mon Jul 28 11:25:22 2008
@@ -95,11 +95,8 @@
     if (ptr != 0)
     {
         Type* const     nonConstPointer =
-#if defined(XALAN_OLD_STYLE_CASTS)
-            (const Type*)ptr;
-#else
             const_cast<Type*>(ptr);
-#endif
+
         nonConstPointer->~Type();
 
         theManager.deallocate(nonConstPointer);

Modified: xalan/c/trunk/src/xalanc/PlatformSupport/DOMStringHelper.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/DOMStringHelper.cpp?rev=680433&r1=680432&r2=680433&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/DOMStringHelper.cpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/DOMStringHelper.cpp Mon Jul 28 11:25:22 2008
@@ -460,19 +460,11 @@
 			OutputIteratorType	theOutputIterator,
 			FunctionType		theFunction)
 {
-#if defined(XALAN_NO_ALGORITHMS_WITH_BUILTINS)
-	return XalanTransform(
-			theInputBegin,
-			theInputEnd,
-			theOutputIterator,
-			theFunction);
-#else
 	return XALAN_STD_QUALIFIER transform(
 			theInputBegin,
 			theInputEnd,
 			theOutputIterator,
 			theFunction);
-#endif
 }
 
 
@@ -936,11 +928,7 @@
 
 		theResult.reserve(theLength);
 
-#if defined(XALAN_NO_ALGORITHMS_WITH_BUILTINS)
-		XalanCopy(
-#else
 		XALAN_STD_QUALIFIER copy(
-#endif
 			data,
 			data + theLength,
 			XALAN_STD_QUALIFIER back_inserter(theResult));

Modified: xalan/c/trunk/src/xalanc/PlatformSupport/DOMStringHelper.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/DOMStringHelper.hpp?rev=680433&r1=680432&r2=680433&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/DOMStringHelper.hpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/DOMStringHelper.hpp Mon Jul 28 11:25:22 2008
@@ -65,58 +65,6 @@
 
 
 
-// This macro has been defined to deal with certain C++ compilers which
-// do not create Unicode strings when the "L" string constant prefix is
-// used.  It is meant _only_ for use with static strings.
-#if defined(XALAN_LSTRSUPPORT) && !defined(XALAN_XALANDOMCHAR_USHORT_MISMATCH)
-
-#define XALAN_STATIC_UCODE_STRING(str) L##str
-
-#else
-
-#define XALAN_STATIC_UCODE_STRING(str) str
-
-#endif
-
-
-
-#if defined(XALAN_NO_ALGORITHMS_WITH_BUILTINS)
-
-template<class InputIteratorType, class OutputIteratorType>
-inline OutputIteratorType
-XalanCopy(
-            InputIteratorType   begin,
-            InputIteratorType   end,
-            OutputIteratorType  iterator)
-{
-    for(; begin != end; ++iterator, ++begin)
-    {
-        *iterator = *begin;
-    }
-
-    return iterator;
-}
-
-
-
-template<class InputIteratorType, class OutputIteratorType, class UnaryFunction>
-inline OutputIteratorType
-XalanTransform(
-            InputIteratorType   begin,
-            InputIteratorType   end,
-            OutputIteratorType  iterator,
-            UnaryFunction       function)
-{
-    for(; begin != end; ++iterator, ++begin)
-    {
-        *iterator = function(*begin);
-    }
-
-    return iterator;
-}
-
-#else
-
 template<class InputIteratorType, class OutputIteratorType>
 inline OutputIteratorType
 XalanCopy(
@@ -140,8 +88,6 @@
     return XALAN_STD_QUALIFIER transform(begin, end, iterator);
 }
 
-#endif
-
 
 
 /**

Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanEncodingPropertyCache.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanEncodingPropertyCache.cpp?rev=680433&r1=680432&r2=680433&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/XalanEncodingPropertyCache.cpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanEncodingPropertyCache.cpp Mon Jul 28 11:25:22 2008
@@ -62,21 +62,13 @@
 		}
 		else
 		{
-#if defined(XALAN_NO_MUTABLE)
-			((XalanEncodingPropertyCache*)this)->m_presentBitmap.set(theChar);
-#else
 			m_presentBitmap.set(theChar);
-#endif
 
-			const bool	fResult = m_transcoder->canTranscodeTo(theChar);
+            const bool	fResult = m_transcoder->canTranscodeTo(theChar);
 
 			if (fResult == true)
 			{
-#if defined(XALAN_NO_MUTABLE)
-				((XalanEncodingPropertyCache*)this)->m_valueBitmap.set(theChar);
-#else
 				m_valueBitmap.set(theChar);
-#endif
 			}
 
 			return fResult;

Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanICUMessageLoader.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanICUMessageLoader.cpp?rev=680433&r1=680432&r2=680433&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/XalanICUMessageLoader.cpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanICUMessageLoader.cpp Mon Jul 28 11:25:22 2008
@@ -122,7 +122,7 @@
 XalanICUMessageLoader::XalanICUMessageLoader(MemoryManagerType &theManager):
 	m_localeBundle(0),
 	m_domainBundle(0),
-	m_unknownMessage(XALAN_STATIC_UCODE_STRING("The message was not found in the ICU resource bundle."), theManager)
+	m_unknownMessage("The message was not found in the ICU resource bundle.", theManager)
 {
  	UErrorCode err = U_ZERO_ERROR;
 

Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanOutputStream.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanOutputStream.cpp?rev=680433&r1=680432&r2=680433&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/XalanOutputStream.cpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanOutputStream.cpp Mon Jul 28 11:25:22 2008
@@ -184,11 +184,7 @@
                 m_transcoder->transcode(
                         theBufferPosition,
                         theRemainingBufferLength,
-#if defined(XALAN_OLD_STYLE_CASTS)
-                        (XMLByte*)&theDestination[0] + theTotalBytesFilled,
-#else
                         reinterpret_cast<XMLByte*>(&theDestination[0]) + theTotalBytesFilled,
-#endif
                         theTargetSize,
                         theSourceBytesEaten,
                         theTargetBytesEaten);
@@ -254,15 +250,11 @@
 
     XalanTranscodingServices::eCode     theCode = XalanTranscodingServices::OK;
 
-    // This turns on an optimization that we can only do if
-    // XalanDOMChar == sizeof(ushort).  See doWrite().
-#if !defined(XALAN_XALANDOMCHAR_USHORT_MISMATCH)
     if (XalanTranscodingServices::encodingIsUTF16(theEncoding) == true)
     {
         m_writeAsUTF16 = true;
     }
     else
-#endif
     {
         m_transcoder = XalanTranscodingServices::makeNewTranscoder(
                     getMemoryManager(),
@@ -297,11 +289,7 @@
 
     if (theLength > 0)
     {
-#if defined(XALAN_OLD_STYLE_CASTS)
-        write((const char*)theProlog, theLength);
-#else
         write(reinterpret_cast<const char*>(theProlog), theLength);
-#endif
     }
 }
 
@@ -352,15 +340,9 @@
 
     if (m_writeAsUTF16 == true)
     {
-        assert(sizeof(XalanDOMChar) == sizeof(char) * 2);
-
         // This is a hack to write UTF-16 through as if it
         // were just chars.  Saves lots of time "transcoding."
-#if defined(XALAN_OLD_STYLE_CASTS)
-        writeData((const char*)theBuffer, theBufferLength * 2);
-#else
         writeData(reinterpret_cast<const char*>(theBuffer), theBufferLength * 2);
-#endif
     }
     else
     {

Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanTranscodingServices.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanTranscodingServices.cpp?rev=680433&r1=680432&r2=680433&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/XalanTranscodingServices.cpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanTranscodingServices.cpp Mon Jul 28 11:25:22 2008
@@ -324,7 +324,7 @@
 bool
 XalanTranscodingServices::encodingIsUTF8(const XalanDOMChar*    theEncodingName)
 {
-    return compareIgnoreCaseASCII(c_wstr(theEncodingName), s_utf8String) == 0 ? true : false;
+    return compareIgnoreCaseASCII(theEncodingName, s_utf8String) == 0 ? true : false;
 }
 
 
@@ -332,7 +332,7 @@
 bool
 XalanTranscodingServices::encodingIsUTF8(const XalanDOMString&  theEncodingName)
 {
-    return encodingIsUTF8(c_wstr(theEncodingName));
+    return encodingIsUTF8(theEncodingName.c_str());
 }
 
 
@@ -340,9 +340,9 @@
 bool
 XalanTranscodingServices::encodingIsUTF16(const XalanDOMChar*   theEncodingName)
 {
-    return compareIgnoreCaseASCII(c_wstr(theEncodingName), s_utf16String) == 0 ||
-           compareIgnoreCaseASCII(c_wstr(theEncodingName), s_utf16LEString) == 0 ||
-           compareIgnoreCaseASCII(c_wstr(theEncodingName), s_utf16BEString) == 0 ? true : false;
+    return compareIgnoreCaseASCII(theEncodingName, s_utf16String) == 0 ||
+           compareIgnoreCaseASCII(theEncodingName, s_utf16LEString) == 0 ||
+           compareIgnoreCaseASCII(theEncodingName, s_utf16BEString) == 0 ? true : false;
 }
 
 
@@ -350,7 +350,7 @@
 bool
 XalanTranscodingServices::encodingIsUTF16(const XalanDOMString&     theEncodingName)
 {
-    return encodingIsUTF16(c_wstr(theEncodingName));
+    return encodingIsUTF16(theEncodingName.c_str());
 }
 
 
@@ -358,14 +358,15 @@
 bool
 XalanTranscodingServices::encodingIsUTF32(const XalanDOMChar*   theEncodingName)
 {
-    return compareIgnoreCaseASCII(c_wstr(theEncodingName), s_utf32String) == 0 ? true : false;
+    return compareIgnoreCaseASCII(theEncodingName, s_utf32String) == 0 ? true : false;
 }
 
 
+
 bool
 XalanTranscodingServices::encodingIsUTF32(const XalanDOMString&     theEncodingName)
 {
-    return encodingIsUTF32(c_wstr(theEncodingName));
+    return encodingIsUTF32(theEncodingName.c_str());
 }
 
 
@@ -373,21 +374,10 @@
 const XalanTranscodingServices::XalanXMLByte*
 XalanTranscodingServices::getStreamProlog(const XalanDOMString&     theEncodingName)
 {
-    if (compareIgnoreCaseASCII(c_wstr(theEncodingName), s_utf16String) == 0)
+    if (compareIgnoreCaseASCII(theEncodingName, s_utf16String) == 0)
     {
-#if defined(XALAN_OLD_STYLE_CASTS)
-        return (const XalanXMLByte*)s_UTF16ByteOrderMark;
-#else
         return reinterpret_cast<const XalanXMLByte*>(s_UTF16ByteOrderMark);
-#endif
-    }
-#if 0
-    // We won't do this for now...
-    else if (compareIgnoreCaseASCII(c_wstr(theEncodingName), s_utf8String) == 0)
-    {
-        return s_UTF8ByteOrderMark;
     }
-#endif
     else
     {
         return s_dummyByteOrderMark;
@@ -399,25 +389,25 @@
 XalanDOMChar
 XalanTranscodingServices::getMaximumCharacterValue(const XalanDOMString&    theEncoding)
 {
-    if (compareIgnoreCaseASCII(c_wstr(theEncoding), s_utf8String) == 0 ||
-        compareIgnoreCaseASCII(c_wstr(theEncoding), s_utf16String) == 0)
+    if (compareIgnoreCaseASCII(theEncoding, s_utf8String) == 0 ||
+        compareIgnoreCaseASCII(theEncoding, s_utf16String) == 0)
     {
-        return XalanDOMChar(0xFFFFu);
+        return static_cast<XalanDOMChar>(0xFFFFu);
     }
-    else if (compareIgnoreCaseASCII(c_wstr(theEncoding), s_iso88591String) == 0)
+    else if (compareIgnoreCaseASCII(theEncoding, s_iso88591String) == 0)
     {
-        return XalanDOMChar(0x00FFu);
+        return static_cast<XalanDOMChar>(0x00FFu);
     }
-    else if (compareIgnoreCaseASCII(c_wstr(theEncoding), s_utf16LEString) == 0 ||
-        compareIgnoreCaseASCII(c_wstr(theEncoding), s_utf16BEString) == 0 ||
-        compareIgnoreCaseASCII(c_wstr(theEncoding), s_utf32String) == 0 ||
-        compareIgnoreCaseASCII(c_wstr(theEncoding), s_shiftJISString) == 0)
+    else if (compareIgnoreCaseASCII(theEncoding, s_utf16LEString) == 0 ||
+             compareIgnoreCaseASCII(theEncoding, s_utf16BEString) == 0 ||
+             compareIgnoreCaseASCII(theEncoding, s_utf32String) == 0 ||
+             compareIgnoreCaseASCII(theEncoding, s_shiftJISString) == 0)
     {
-        return XalanDOMChar(0xFFFFu);
+        return static_cast<XalanDOMChar>(0xFFFFu);
     }
     else
     {
-        return XalanDOMChar(0x007fu);
+        return static_cast<XalanDOMChar>(0x007fu);
     }
 }
 

Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanUTF16Transcoder.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanUTF16Transcoder.cpp?rev=680433&r1=680432&r2=680433&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/XalanUTF16Transcoder.cpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanUTF16Transcoder.cpp Mon Jul 28 11:25:22 2008
@@ -77,11 +77,7 @@
 		}
 		else
 		{
-#if defined(XALAN_OLD_STYLE_CASTS)
-			*(XalanDOMChar*)(theTarget + theTargetPosition) = theSourceData[theSourceEaten++];
-#else
 			*reinterpret_cast<XalanDOMChar*>(theTarget + theTargetPosition) = theSourceData[theSourceEaten++];
-#endif
 
 			theTargetPosition += 2;
 		}
@@ -118,11 +114,7 @@
 		}
 		else
 		{
-#if defined(XALAN_OLD_STYLE_CASTS)
-			theTarget[theTargetPosition++] = *(const XalanDOMChar*)(theSourceData + theSourceCount++);
-#else
 			theTarget[theTargetPosition++] = *reinterpret_cast<const XalanDOMChar*>(theSourceData + theSourceCount++);
-#endif
 
 			*theCharSizes++ = 2;
 		}

Modified: xalan/c/trunk/src/xalanc/TestXPath/TestXPath.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/TestXPath/TestXPath.cpp?rev=680433&r1=680432&r2=680433&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/TestXPath/TestXPath.cpp (original)
+++ xalan/c/trunk/src/xalanc/TestXPath/TestXPath.cpp Mon Jul 28 11:25:22 2008
@@ -321,11 +321,7 @@
     if (theNode->getNodeType() == XalanNode::ELEMENT_NODE)
     {
         const XalanElement* const   theElement =
-#if defined(XALAN_OLD_STYLE_CASTS)
-                    (const XalanElement*)theNode;
-#else
                     static_cast<const XalanElement*>(theNode);
-#endif
 
         const XalanNamedNodeMap* const  theAttributes =
             theElement->getAttributes();

Modified: xalan/c/trunk/src/xalanc/TestXSLT/process.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/TestXSLT/process.cpp?rev=680433&r1=680432&r2=680433&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/TestXSLT/process.cpp (original)
+++ xalan/c/trunk/src/xalanc/TestXSLT/process.cpp Mon Jul 28 11:25:22 2008
@@ -788,8 +788,8 @@
 
 	XSLTInit	theInit(theManager);
 
-	const XalanDOMString	mimeEncoding(XALAN_STATIC_UCODE_STRING("UTF-8"), theManager);
-	const XalanDOMString	encoding(XALAN_STATIC_UCODE_STRING("UTF-8"), theManager);
+	const XalanDOMString	mimeEncoding("UTF-8", theManager);
+	const XalanDOMString	encoding("UTF-8", theManager);
 
 	/**
 	 * The default diagnostic writer...

Modified: xalan/c/trunk/src/xalanc/XMLSupport/FormatterTreeWalker.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XMLSupport/FormatterTreeWalker.cpp?rev=680433&r1=680432&r2=680433&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XMLSupport/FormatterTreeWalker.cpp (original)
+++ xalan/c/trunk/src/xalanc/XMLSupport/FormatterTreeWalker.cpp Mon Jul 28 11:25:22 2008
@@ -77,11 +77,7 @@
 	case XalanNode::ELEMENT_NODE:
 		{
 			const XalanElement*	theElementNode =
-#if defined(XALAN_OLD_STYLE_CASTS)
-				(const XalanElement*)node;
-#else
 				static_cast<const XalanElement*>(node);
-#endif
 
 			const XalanNamedNodeMap*	atts = theElementNode->getAttributes();
 			assert(atts != 0);
@@ -140,11 +136,7 @@
 {
 	assert(node != 0);
 
-#if defined(XALAN_OLD_STYLE_CASTS)
-	return startNode((const XalanNode*)node);
-#else
 	return startNode(const_cast<const XalanNode*>(node));
-#endif
 }
 
 
@@ -177,11 +169,7 @@
 bool
 FormatterTreeWalker::endNode(XalanNode*		node)
 {
-#if defined(XALAN_OLD_STYLE_CASTS)
-	return endNode((const XalanNode*)node);
-#else
 	return endNode(const_cast<const XalanNode*>(node));
-#endif
 }
 
 

Modified: xalan/c/trunk/src/xalanc/XPath/ElementPrefixResolverProxy.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/ElementPrefixResolverProxy.cpp?rev=680433&r1=680432&r2=680433&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/ElementPrefixResolverProxy.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/ElementPrefixResolverProxy.cpp Mon Jul 28 11:25:22 2008
@@ -92,12 +92,7 @@
 {
 	if (m_envSupport != 0 && m_namespaceContext != 0 && length(m_uri) == 0)
 	{
-#if defined(XALAN_NO_MUTABLE)
-		((ElementPrefixResolverProxy*)this)->m_uri =
-#else
-		m_uri =
-#endif
-				m_envSupport->findURIFromDoc(m_namespaceContext->getOwnerDocument());
+		m_uri = m_envSupport->findURIFromDoc(m_namespaceContext->getOwnerDocument());
 	}
 
 	return m_uri;

Modified: xalan/c/trunk/src/xalanc/XPath/FunctionID.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/FunctionID.cpp?rev=680433&r1=680432&r2=680433&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/FunctionID.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/FunctionID.cpp Mon Jul 28 11:25:22 2008
@@ -70,11 +70,7 @@
 
     // Get the context document, so we can search for nodes.
     const XalanDocument* const  theDocContext = context->getNodeType() == XalanNode::DOCUMENT_NODE ?
-#if defined(XALAN_OLD_STYLE_CASTS)
-                                    (const XalanDocument*)context :
-#else
                                     static_cast<const XalanDocument*>(context) :
-#endif
                                     context->getOwnerDocument();
     assert(theDocContext != 0);
 

Modified: xalan/c/trunk/src/xalanc/XPath/FunctionLang.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/FunctionLang.cpp?rev=680433&r1=680432&r2=680433&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/FunctionLang.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/FunctionLang.cpp Mon Jul 28 11:25:22 2008
@@ -79,11 +79,7 @@
         if (XalanNode::ELEMENT_NODE == parent->getNodeType())
         {
             const XalanElement* const   theElementNode =
-#if defined(XALAN_OLD_STYLE_CASTS)
-                (const XalanElement*)parent;
-#else
                 static_cast<const XalanElement*>(parent);
-#endif
 
             const XalanNamedNodeMap* const  theAttributes =
                 theElementNode->getAttributes();

Modified: xalan/c/trunk/src/xalanc/XPath/XNodeSetBase.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XNodeSetBase.cpp?rev=680433&r1=680432&r2=680433&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XNodeSetBase.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XNodeSetBase.cpp Mon Jul 28 11:25:22 2008
@@ -86,11 +86,7 @@
 {
 	if (DoubleSupport::equal(m_cachedNumberValue, theBogusNumberValue) == true)
 	{
-#if defined(XALAN_NO_MUTABLE)
-		((XNodeSetBase*)this)->m_cachedNumberValue = DoubleSupport::toDouble(str());
-#else
 		m_cachedNumberValue = DoubleSupport::toDouble(str(),getMemoryManager());
-#endif
 	}
 
 	return m_cachedNumberValue;
@@ -115,11 +111,7 @@
 		const XalanNode* const	theNode = item(0);
 		assert(theNode != 0);
 
-#if defined(XALAN_NO_MUTABLE)
-		DOMServices::getNodeData(*theNode, ((XNodeSetBase*)this)->m_cachedStringValue);
-#else
 		DOMServices::getNodeData(*theNode, m_cachedStringValue);
-#endif
 	}
 
 	return m_cachedStringValue;

Modified: xalan/c/trunk/src/xalanc/XPath/XNumber.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XNumber.cpp?rev=680433&r1=680432&r2=680433&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XNumber.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XNumber.cpp Mon Jul 28 11:25:22 2008
@@ -66,11 +66,7 @@
 {
 	if (isEmpty(m_cachedStringValue) == true)
 	{
-#if defined(XALAN_NO_MUTABLE)
-		NumberToDOMString(m_value, ((XNumber*)this)->m_cachedStringValue);
-#else
 		NumberToDOMString(m_value, m_cachedStringValue);
-#endif
 	}
 
 	return m_cachedStringValue;

Modified: xalan/c/trunk/src/xalanc/XPath/XObjectFactoryDefault.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XObjectFactoryDefault.cpp?rev=680433&r1=680432&r2=680433&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XObjectFactoryDefault.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XObjectFactoryDefault.cpp Mon Jul 28 11:25:22 2008
@@ -119,11 +119,7 @@
 	case XObject::eTypeStringAdapter:
 		{
 			XStringAdapter* const		theXStringAdapter =
-#if defined(XALAN_OLD_STYLE_CASTS)
-				(XStringAdapter*)theXObject;
-#else
 				static_cast<XStringAdapter*>(theXObject);
-#endif
 
 			bStatus = m_xstringAdapterAllocator.destroy(theXStringAdapter);
 		}
@@ -132,11 +128,7 @@
 	case XObject::eTypeXTokenNumberAdapter:
 		{
 			XTokenNumberAdapter* const	theAdapter =
-#if defined(XALAN_OLD_STYLE_CASTS)
-				(XTokenNumberAdapter*)theXObject;
-#else
 				static_cast<XTokenNumberAdapter*>(theXObject);
-#endif
 
 			bStatus = m_xtokenNumberAdapterAllocator.destroy(theAdapter);
 		}
@@ -145,11 +137,7 @@
 	case XObject::eTypeXTokenStringAdapter:
 		{
 			XTokenStringAdapter* const	theAdapter =
-#if defined(XALAN_OLD_STYLE_CASTS)
-				(XTokenStringAdapter*)theXObject;
-#else
 				static_cast<XTokenStringAdapter*>(theXObject);
-#endif
 
 			bStatus = m_xtokenStringAdapterAllocator.destroy(theAdapter);
 		}
@@ -158,11 +146,7 @@
 	case XObject::eTypeString:
 		{
 			XString* const	theXString =
-#if defined(XALAN_OLD_STYLE_CASTS)
-				(XString*)theXObject;
-#else
 				static_cast<XString*>(theXObject);
-#endif
 
 			if (m_xstringCache.size() < eXStringCacheMax)
 			{
@@ -180,11 +164,7 @@
 	case XObject::eTypeStringCached:
 		{
 			XStringCached* const	theXStringCached =
-#if defined(XALAN_OLD_STYLE_CASTS)
-				(XStringCached*)theXObject;
-#else
 				static_cast<XStringCached*>(theXObject);
-#endif
 
 			bStatus = m_xstringCachedAllocator.destroy(theXStringCached);
 		}
@@ -193,11 +173,7 @@
 	case XObject::eTypeStringReference:
 		{
 			XStringReference* const		theXStringReference =
-#if defined(XALAN_OLD_STYLE_CASTS)
-				(XStringReference*)theXObject;
-#else
 				static_cast<XStringReference*>(theXObject);
-#endif
 
 			bStatus = m_xstringReferenceAllocator.destroy(theXStringReference);
 		}
@@ -206,11 +182,7 @@
 	case  XObject::eTypeNumber:
 		{
 			XNumber* const	theXNumber =
-#if defined(XALAN_OLD_STYLE_CASTS)
-				(XNumber*)theXObject;
-#else
 				static_cast<XNumber*>(theXObject);
-#endif
 
 			if (m_xnumberCache.size() < eXNumberCacheMax)
 			{
@@ -228,11 +200,7 @@
 	case XObject::eTypeNodeSet:
 		{
 			XNodeSet* const		theXNodeSet =
-#if defined(XALAN_OLD_STYLE_CASTS)
-				(XNodeSet*)theXObject;
-#else
 				static_cast<XNodeSet*>(theXObject);
-#endif
 
 			if (m_xnodesetCache.size() < eXNodeSetCacheMax)
 			{
@@ -252,11 +220,7 @@
 	case XObject::eTypeNodeSetNodeProxy:
 		{
 			XNodeSetNodeProxy* const	theXNodeSet =
-#if defined(XALAN_OLD_STYLE_CASTS)
-				(XNodeSetNodeProxy*)theXObject;
-#else
 				static_cast<XNodeSetNodeProxy*>(theXObject);
-#endif
 
 			bStatus = m_xnodesetNodeProxyAllocator.destroy(theXNodeSet);
 		}

Modified: xalan/c/trunk/src/xalanc/XPath/XObjectResultTreeFragProxy.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XObjectResultTreeFragProxy.cpp?rev=680433&r1=680432&r2=680433&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XObjectResultTreeFragProxy.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XObjectResultTreeFragProxy.cpp Mon Jul 28 11:25:22 2008
@@ -40,15 +40,10 @@
 
 
 
-#define XALAN_NO_MUTABLE
 XalanNode*
 XObjectResultTreeFragProxy::getFirstChild() const
 {
-#if defined(XALAN_NO_MUTABLE)
-	return (XalanNode*)&m_proxy;
-#else
 	return &m_proxy;
-#endif
 }
 
 
@@ -56,11 +51,7 @@
 XalanNode*
 XObjectResultTreeFragProxy::getLastChild() const
 {
-#if defined(XALAN_NO_MUTABLE)
-	return (XalanNode*)&m_proxy;
-#else
 	return &m_proxy;
-#endif
 }
 
 

Modified: xalan/c/trunk/src/xalanc/XPath/XPath.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XPath.cpp?rev=680433&r1=680432&r2=680433&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XPath.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XPath.cpp Mon Jul 28 11:25:22 2008
@@ -3466,11 +3466,7 @@
     // This is a special case for RTFs, as the "owner document" is
     // just a factory for the RTF.  Instead, we have to search for
     // the containing XalanDocumentFragment node.
-#if defined(XALAN_OLD_STYLE_CASTS)
-    if (((const XalanDocument*)docContext)->getDocumentElement() == 0)
-#else
     if (static_cast<const XalanDocument*>(docContext)->getDocumentElement() == 0)
-#endif
     {
         docContext = context;
 
@@ -4923,11 +4919,7 @@
 {
     assert(theAttributeNode.getNodeType() == XalanNode::ATTRIBUTE_NODE);
 
-#if defined(XALAN_OLD_STYLE_CASTS)
-    return DOMServices::isNamespaceDeclaration((const XalanAttr&)theAttributeNode);
-#else
     return DOMServices::isNamespaceDeclaration(static_cast<const XalanAttr&>(theAttributeNode));
-#endif
 }
 
 
@@ -4960,11 +4952,7 @@
             XalanNode::NodeType     nodeType) const
 {
     if (XalanNode::TEXT_NODE == nodeType &&
-#if defined(XALAN_OLD_STYLE_CASTS)
-        shouldStripSourceNode((const XalanText&)context) == false)
-#else
         shouldStripSourceNode(static_cast<const XalanText&>(context)) == false)
-#endif
     {
         return eMatchScoreNodeTest;
     }
@@ -5019,11 +5007,7 @@
             XalanNode::NodeType     nodeType) const
 {
     if (nodeType != XalanNode::TEXT_NODE ||
-#if defined(XALAN_OLD_STYLE_CASTS)
-        shouldStripSourceNode((const XalanText&)context) == false)
-#else
         shouldStripSourceNode(static_cast<const XalanText&>(context)) == false)
-#endif
     {
         return eMatchScoreNodeTest;
     }

Modified: xalan/c/trunk/src/xalanc/XPath/XPathExecutionContextDefault.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XPathExecutionContextDefault.cpp?rev=680433&r1=680432&r2=680433&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XPathExecutionContextDefault.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XPathExecutionContextDefault.cpp Mon Jul 28 11:25:22 2008
@@ -263,13 +263,8 @@
         const size_type     theIndex = m_contextNodeListStack.back()->indexOf(&contextNode);
 
         // If not found, it's 0.  Otherwise, it's the index + 1
-#if defined(XALAN_NO_MUTABLE)
-        ((XPathExecutionContextDefault*)this)->m_cachedPosition.m_index = theIndex == NodeRefListBase::npos ? 0 : theIndex + 1;
-        ((XPathExecutionContextDefault*)this)->m_cachedPosition.m_node = &contextNode;
-#else
         m_cachedPosition.m_index = theIndex == NodeRefListBase::npos ? 0 : theIndex + 1;
         m_cachedPosition.m_node = &contextNode;
-#endif
     }
 
     return m_cachedPosition.m_index;

Modified: xalan/c/trunk/src/xalanc/XPath/XPathExecutionContextDefault.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XPathExecutionContextDefault.hpp?rev=680433&r1=680432&r2=680433&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XPathExecutionContextDefault.hpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XPathExecutionContextDefault.hpp Mon Jul 28 11:25:22 2008
@@ -165,11 +165,7 @@
 	XalanQNameByValue&
 	getScratchQName() const
 	{
-#if defined(XALAN_NO_MUTABLE)
-		return ((XPathExecutionContextDefault*)this)->m_scratchQName;
-#else
 		return m_scratchQName;
-#endif
 	}
 
 	virtual void doFormatNumber(

Modified: xalan/c/trunk/src/xalanc/XPath/XStringBase.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XStringBase.cpp?rev=680433&r1=680432&r2=680433&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XStringBase.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XStringBase.cpp Mon Jul 28 11:25:22 2008
@@ -77,12 +77,7 @@
 {
 	if (m_cachedNumberValue == 0.0)
 	{
-
-#if defined(XALAN_NO_MUTABLE)
-		((XStringBase*)this)->m_cachedNumberValue = DoubleSupport::toDouble(str(),getMemoryManager());
-#else
 		m_cachedNumberValue = DoubleSupport::toDouble(str(),getMemoryManager());
-#endif
 	}
 
 	return m_cachedNumberValue;

Modified: xalan/c/trunk/src/xalanc/XPath/XalanDocumentFragmentNodeRefListBaseProxy.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XalanDocumentFragmentNodeRefListBaseProxy.cpp?rev=680433&r1=680432&r2=680433&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XalanDocumentFragmentNodeRefListBaseProxy.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XalanDocumentFragmentNodeRefListBaseProxy.cpp Mon Jul 28 11:25:22 2008
@@ -64,11 +64,7 @@
 {
 	assert(index == 0);
 
-#if defined(XALAN_OLD_STYLE_CASTS)
-	return (XalanDocumentFragment*)&m_value;
-#else
 	return const_cast<XalanDocumentFragment*>(&m_value);
-#endif
 }
 
 

Modified: xalan/c/trunk/src/xalanc/XPathCAPI/XPathCAPI.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPathCAPI/XPathCAPI.cpp?rev=680433&r1=680432&r2=680433&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPathCAPI/XPathCAPI.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPathCAPI/XPathCAPI.cpp Mon Jul 28 11:25:22 2008
@@ -206,11 +206,7 @@
 {
 	assert(theHandle != 0);
 
-#if defined(XALAN_OLD_STYLE_CASTS)
-	return (XPathEvaluator*)theHandle;
-#else
 	return static_cast<XPathEvaluator*>(theHandle);
-#endif
 }
 
 
@@ -220,11 +216,7 @@
 {
 	assert(theHandle != 0);
 
-#if defined(XALAN_OLD_STYLE_CASTS)
-	return (XPath*)theHandle;
-#else
 	return static_cast<XPath*>(theHandle);
-#endif
 }
 
 
@@ -282,11 +274,7 @@
 	size_type	theTargetBytesUsed = 0;
 
 	const XalanTranscodingServices::eCode	theCode = theTranscoder->transcode(
-#if defined(XALAN_OLD_STYLE_CASTS)
-					(const XalanOutputTranscoder::XalanXMLByte*)theString,
-#else
 					reinterpret_cast<const XalanOutputTranscoder::XalanXMLByte*>(theString),
-#endif
 					theLength,
 					theChars,
 					theLength,
@@ -549,11 +537,7 @@
 
 			// Create an input source...
 			const MemBufInputSource		theInputSource(
-#if defined(XALAN_OLD_STYLE_CASTS)
-											(const XMLByte*)theXML,
-#else
 											reinterpret_cast<const XMLByte*>(theXML),
-#endif
 											XalanDOMString::length(theXML),
 											"SourceXML",
 											false);

Modified: xalan/c/trunk/src/xalanc/XSLT/ElemApplyTemplates.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemApplyTemplates.cpp?rev=680433&r1=680432&r2=680433&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemApplyTemplates.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemApplyTemplates.cpp Mon Jul 28 11:25:22 2008
@@ -304,11 +304,7 @@
 
     // Filter out any attributes nodes that are namespace declarations
     if (nodeType != XalanNode::ATTRIBUTE_NODE ||
-#if defined(XALAN_OLD_STYLE_CASTS)
-        DOMServices::isNamespaceDeclaration((const XalanAttr&)*child) == false)
-#else
         DOMServices::isNamespaceDeclaration(static_cast<const XalanAttr&>(*child)) == false)
-#endif
     {
         ParentType::transformChild(
             executionContext,

Modified: xalan/c/trunk/src/xalanc/XSLT/ElemNumber.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemNumber.cpp?rev=680433&r1=680432&r2=680433&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemNumber.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemNumber.cpp Mon Jul 28 11:25:22 2008
@@ -394,11 +394,8 @@
                 // OK, there's a prefix, so create a prefix resolver so the
                 // prefix can be properly resolved...
                 const XalanElement* const   theElement =
-#if defined(XALAN_OLD_STYLE_CASTS)
-                    (const XalanElement*)contextNode;
-#else
                     static_cast<const XalanElement*>(contextNode);
-#endif
+
                     const ElementPrefixResolverProxy    theProxy( theElement, executionContext.getMemoryManager());
 
                 countMatchPattern =
@@ -439,11 +436,8 @@
     case XalanNode::ATTRIBUTE_NODE:
         {
             const XalanAttr* const  theAttribute =
-#if defined(XALAN_OLD_STYLE_CASTS)
-                (const XalanAttr*)contextNode;
-#else
                 static_cast<const XalanAttr*>(contextNode);
-#endif
+
             assert(theAttribute->getOwnerElement() != 0);
 
             const XalanDOMString&   theNodeName = theAttribute->getNodeName();

Modified: xalan/c/trunk/src/xalanc/XSLT/ElemTemplateElement.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemTemplateElement.cpp?rev=680433&r1=680432&r2=680433&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemTemplateElement.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemTemplateElement.cpp Mon Jul 28 11:25:22 2008
@@ -1389,11 +1389,7 @@
                 m_flags |= eHasDirectTemplate;
 
                 ElemCallTemplate* const     theCallTemplateChild =
-#if defined(XALAN_OLD_STYLE_CASTS)
-                    (ElemCallTemplate*)m_firstChild;
-#else
                     static_cast<ElemCallTemplate*>(m_firstChild);
-#endif
 
                 m_directTemplate = theCallTemplateChild->getTemplate();
             }

Modified: xalan/c/trunk/src/xalanc/XSLT/ElemValueOf.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemValueOf.cpp?rev=680433&r1=680432&r2=680433&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemValueOf.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemValueOf.cpp Mon Jul 28 11:25:22 2008
@@ -394,7 +394,7 @@
     {
         const StylesheetExecutionContext::GetAndReleaseCachedString     thePattern(executionContext);
 
-        thePattern.get() = XALAN_STATIC_UCODE_STRING(".");
+        thePattern.get() = ".";
 
         fireSelectionEvent(
             executionContext,

Modified: xalan/c/trunk/src/xalanc/XSLT/ElemWithParam.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemWithParam.cpp?rev=680433&r1=680432&r2=680433&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemWithParam.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemWithParam.cpp Mon Jul 28 11:25:22 2008
@@ -162,16 +162,21 @@
     
         if (0 != executionContext.getTraceListeners())
         {
+            const StylesheetExecutionContext::GetAndReleaseCachedString     theGuard(executionContext);
+
+            XalanDOMString&     theString = theGuard.get();
+
+            theString = "select";
+
             executionContext.fireSelectEvent(
                 SelectionEvent(
                     executionContext,
                     executionContext.getCurrentNode(),
                     *this,
-                    XalanDOMString(XALAN_STATIC_UCODE_STRING("select"), executionContext.getMemoryManager()),
+                    theString,
                     *m_selectPattern,
                     theValue));
         }
-
     }
 
     assert(theValue.null() == false);

Modified: xalan/c/trunk/src/xalanc/XSLT/FunctionDocument.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/FunctionDocument.cpp?rev=680433&r1=680432&r2=680433&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/FunctionDocument.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/FunctionDocument.cpp Mon Jul 28 11:25:22 2008
@@ -184,11 +184,7 @@
     assert(resolver != 0);
 
     const XalanDocument* const  ownerDocument = XalanNode::DOCUMENT_NODE == resolver->getNodeType() ?
-#if defined(XALAN_OLD_STYLE_CASTS)
-            (const XalanDocument*)resolver :
-#else
             static_cast<const XalanDocument*>(resolver) :
-#endif
             resolver->getOwnerDocument();
 
     getDoc(
@@ -289,11 +285,7 @@
                 assert(baseNode != 0);
 
                 XalanDocument* const    baseDoc = XalanNode::DOCUMENT_NODE == baseNode->getNodeType() ?
-#if defined(XALAN_OLD_STYLE_CASTS)
-                    (XalanDocument*)baseNode :
-#else
                     static_cast<XalanDocument*>(baseNode) :
-#endif
                     baseNode->getOwnerDocument();
 
                 base = executionContext.findURIFromDoc(baseDoc);

Modified: xalan/c/trunk/src/xalanc/XSLT/FunctionUnparsedEntityURI.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/FunctionUnparsedEntityURI.cpp?rev=680433&r1=680432&r2=680433&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/FunctionUnparsedEntityURI.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/FunctionUnparsedEntityURI.cpp Mon Jul 28 11:25:22 2008
@@ -76,11 +76,7 @@
 
         XalanDocument* const    doc =
                 XalanNode::DOCUMENT_NODE == context->getNodeType() ?
-#if defined(XALAN_OLD_STYLE_CASTS)
-                    (XalanDocument*)context :
-#else
                     static_cast<XalanDocument*>(context) :
-#endif
                     context->getOwnerDocument();
         assert(doc != 0);
 

Modified: xalan/c/trunk/src/xalanc/XSLT/Stylesheet.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/Stylesheet.cpp?rev=680433&r1=680432&r2=680433&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/Stylesheet.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/Stylesheet.cpp Mon Jul 28 11:25:22 2008
@@ -1089,11 +1089,7 @@
         break;
 
     case XalanNode::ATTRIBUTE_NODE:
-#if defined(XALAN_OLD_STYLE_CASTS)
-        if (DOMServices::isNamespaceDeclaration((const XalanAttr&)theNode) == true)
-#else
         if ((DOMServices::isNamespaceDeclaration(static_cast<const XalanAttr&>(theNode)) == true))
-#endif
         {
             return &s_emptyTemplateList;
         } 

Modified: xalan/c/trunk/src/xalanc/XSLT/StylesheetConstructionContextDefault.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/StylesheetConstructionContextDefault.hpp?rev=680433&r1=680432&r2=680433&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/StylesheetConstructionContextDefault.hpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/StylesheetConstructionContextDefault.hpp Mon Jul 28 11:25:22 2008
@@ -440,11 +440,7 @@
 	{
 		assert(sizeof(AVT**) == sizeof(PointerVectorAllocatorType::value_type));
 
-#if defined(XALAN_OLD_STYLE_CASTS)
-		return (const AVT**)m_pointerVectorAllocator.allocate(theSize);
-#else
 		return reinterpret_cast<const AVT**>(m_pointerVectorAllocator.allocate(theSize));
-#endif
 	}
 
 	const AVTPart**
@@ -452,11 +448,7 @@
 	{
 		assert(sizeof(AVTPart**) == sizeof(PointerVectorAllocatorType::value_type));
 
-#if defined(XALAN_OLD_STYLE_CASTS)
-		return (const AVTPart**)m_pointerVectorAllocator.allocate(theSize);
-#else
 		return reinterpret_cast<const AVTPart**>(m_pointerVectorAllocator.allocate(theSize));
-#endif
 	}
 
 	const XalanQName**
@@ -464,11 +456,7 @@
 	{
 		assert(sizeof(XalanQName**) == sizeof(PointerVectorAllocatorType::value_type));
 
-#if defined(XALAN_OLD_STYLE_CASTS)
-		return (const XalanQName**)m_pointerVectorAllocator.allocate(theSize);
-#else
 		return reinterpret_cast<const XalanQName**>(m_pointerVectorAllocator.allocate(theSize));
-#endif
 	}
 
 

Modified: xalan/c/trunk/src/xalanc/XSLT/StylesheetExecutionContextDefault.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/StylesheetExecutionContextDefault.cpp?rev=680433&r1=680432&r2=680433&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/StylesheetExecutionContextDefault.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/StylesheetExecutionContextDefault.cpp Mon Jul 28 11:25:22 2008
@@ -1330,18 +1330,10 @@
 
         if (m_usePerInstanceDocumentFactory == true)
         {
-#if defined(XALAN_OLD_STYLE_CASTS)
-            m_documentAllocator.destroy((XalanSourceTreeDocument*)theDocumentFragment->getOwnerDocument());
-#else
             m_documentAllocator.destroy(static_cast<XalanSourceTreeDocument*>(theDocumentFragment->getOwnerDocument()));
-#endif
         }
 
-#if defined(XALAN_OLD_STYLE_CASTS)
-        m_documentFragmentAllocator.destroy((XalanSourceTreeDocumentFragment*)theDocumentFragment);
-#else
         m_documentFragmentAllocator.destroy(static_cast<XalanSourceTreeDocumentFragment*>(theDocumentFragment));
-#endif
 
         return true;
     }
@@ -2602,11 +2594,7 @@
                 }
 
                 const ElemWithParam* const  xslParamElement =
-#if defined(XALAN_OLD_STYLE_CASTS)
-                        (ElemWithParam*)child;
-#else
                         static_cast<const ElemWithParam*>(child);
-#endif
 
                 params.push_back(ParamsVectorType::value_type(&xslParamElement->getQName(), theXObject));
             }
@@ -2623,13 +2611,9 @@
 {
     assert(m_xsltProcessor != 0);
 
-    if(m_sourceTreeResultTreeFactory.get() == 0)
+    if (m_sourceTreeResultTreeFactory.get() == 0)
     {
-#if defined(XALAN_NO_MUTABLE)
-        ((StylesheetExecutionContextDefault*)this)->m_sourceTreeResultTreeFactory.reset(
-#else
         m_sourceTreeResultTreeFactory.reset(
-#endif
             &theManager, 
             XalanSourceTreeDocument::create(theManager));
     }
@@ -2648,7 +2632,7 @@
     const XPathCacheMapType::const_iterator     theEnd =
         m_matchPatternCache.end();
 
-    while(i != theEnd)
+    while (i != theEnd)
     {
         if ((*i).second.first == theXPath)
         {

Modified: xalan/c/trunk/src/xalanc/XSLT/StylesheetHandler.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/StylesheetHandler.cpp?rev=680433&r1=680432&r2=680433&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/StylesheetHandler.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/StylesheetHandler.cpp Mon Jul 28 11:25:22 2008
@@ -1643,11 +1643,8 @@
 
         if (preserveSpace == false && parent->getXSLToken() == StylesheetConstructionContext::ELEMNAME_TEXT)
         {
-#if defined(XALAN_OLD_STYLE_CASTS)
-            disableOutputEscaping = ((ElemText*)parent)->getDisableOutputEscaping();
-#else
             disableOutputEscaping = static_cast<ElemText*>(parent)->getDisableOutputEscaping();
-#endif
+
             preserveSpace = true;
 
             parent = m_elemStack[m_elemStack.size() - 2];
@@ -1956,19 +1953,11 @@
 
         if (tok == StylesheetConstructionContext::ELEMNAME_UNDEFINED)
         {
-#if defined(XALAN_OLD_STYLE_CASTS)
-            m_stylesheetHandler.m_elemEmptyAllocator.destroy((ElemEmpty*)m_lastPopped);
-#else
             m_stylesheetHandler.m_elemEmptyAllocator.destroy(static_cast<ElemEmpty*>(m_lastPopped));
-#endif
         }
         else if (tok == StylesheetConstructionContext::ELEMNAME_TEXT)
         {
-#if defined(XALAN_OLD_STYLE_CASTS)
-            m_stylesheetHandler.m_elemTextAllocator.destroy((ElemText*)m_lastPopped);
-#else
             m_stylesheetHandler.m_elemTextAllocator.destroy(static_cast<ElemText*>(m_lastPopped));
-#endif
         }
     }
 }

Modified: xalan/c/trunk/src/xalanc/XSLT/StylesheetRoot.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/StylesheetRoot.cpp?rev=680433&r1=680432&r2=680433&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/StylesheetRoot.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/StylesheetRoot.cpp Mon Jul 28 11:25:22 2008
@@ -759,11 +759,7 @@
 
     XalanDocument* const    docNode = 
             XalanNode::DOCUMENT_NODE == context->getNodeType() ?
-#if defined(XALAN_OLD_STYLE_CASTS)
-                    (XalanDocument*)context :
-#else
                     static_cast<XalanDocument*>(context) :
-#endif
                         context->getOwnerDocument();
 
     assert(docNode != 0);
@@ -889,11 +885,7 @@
     if (parent->getNodeType() == XalanNode::ELEMENT_NODE)
     {
         const XalanElement* const   theElement =
-#if defined(XALAN_OLD_STYLE_CASTS)
-                (const XalanElement*)parent;
-#else
                 static_cast<const XalanElement*>(parent);
-#endif
 
         typedef WhitespaceElementsVectorType::const_iterator    const_iterator;
 

Modified: xalan/c/trunk/src/xalanc/XSLT/TraceListenerDefault.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/TraceListenerDefault.cpp?rev=680433&r1=680432&r2=680433&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/TraceListenerDefault.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/TraceListenerDefault.cpp Mon Jul 28 11:25:22 2008
@@ -89,11 +89,7 @@
             m_printWriter.print("    ");
 
             const ElemTextLiteral&  etl =
-#if defined(XALAN_OLD_STYLE_CASTS)
-                (const ElemTextLiteral&)ev.m_styleNode;
-#else
                 static_cast<const ElemTextLiteral&>(ev.m_styleNode);
-#endif
 
             m_printWriter.println(etl.getText());
         }
@@ -103,11 +99,7 @@
         if (m_traceTemplates == true || m_traceElements == true)
         {
             const ElemTemplate&     et =
-#if defined(XALAN_OLD_STYLE_CASTS)
-                (const ElemTemplate&)ev.m_styleNode;
-#else
                 static_cast<const ElemTemplate&>(ev.m_styleNode);
-#endif
 
             XalanDOMString lineNumbString(m_memoryManager);
 
@@ -217,7 +209,7 @@
         {
             assert(nl.item(i) != 0);
 
-            m_printWriter.print(XALAN_STATIC_UCODE_STRING("     "));
+            m_printWriter.print("     ");
 
             DOMServices::getNodeData(*nl.item(i), msg);
 



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


Mime
View raw message