dbertoni 2002/11/19 18:27:18
Modified: c/src/PlatformSupport ArenaAllocator.hpp ArenaBlock.hpp
AttributeListImpl.cpp AttributeListImpl.hpp
AttributeVectorEntry.hpp
AttributeVectorEntryExtended.hpp AttributesImpl.cpp
AttributesImpl.hpp DOMStringHelper.cpp
DOMStringHelper.hpp DOMStringPrintWriter.cpp
DOMStringPrintWriter.hpp DirectoryEnumerator.hpp
DoubleSupport.cpp DoubleSupport.hpp
ExecutionContext.cpp ExecutionContext.hpp
FormatterListener.cpp FormatterListener.hpp
NamedNodeMapAttributeList.cpp
NamedNodeMapAttributeList.hpp NullPrintWriter.cpp
NullPrintWriter.hpp PlatformSupportDefinitions.hpp
PlatformSupportInit.cpp PlatformSupportInit.hpp
PrefixResolver.cpp PrefixResolver.hpp
PrintWriter.cpp PrintWriter.hpp Resettable.cpp
Resettable.hpp ReusableArenaAllocator.hpp
ReusableArenaBlock.hpp StdBinInputStream.cpp
StdBinInputStream.hpp StringTokenizer.cpp
StringTokenizer.hpp URISupport.cpp URISupport.hpp
Writer.cpp Writer.hpp XSLException.cpp
XSLException.hpp XalanAllocator.hpp
XalanArrayAllocator.hpp XalanBitmap.cpp
XalanBitmap.hpp XalanDOMStringAllocator.cpp
XalanDOMStringAllocator.hpp XalanDOMStringCache.cpp
XalanDOMStringCache.hpp XalanDOMStringHashTable.cpp
XalanDOMStringHashTable.hpp XalanDOMStringPool.cpp
XalanDOMStringPool.hpp XalanDecimalFormat.cpp
XalanDecimalFormat.hpp
XalanDecimalFormatSymbols.cpp
XalanDecimalFormatSymbols.hpp
XalanEncodingPropertyCache.cpp
XalanEncodingPropertyCache.hpp
XalanFileOutputStream.cpp XalanFileOutputStream.hpp
XalanLocator.hpp XalanNamespace.hpp
XalanNullOutputStream.cpp XalanNullOutputStream.hpp
XalanNumberFormat.cpp XalanNumberFormat.hpp
XalanOutputStream.cpp XalanOutputStream.hpp
XalanOutputStreamPrintWriter.cpp
XalanOutputStreamPrintWriter.hpp
XalanReferenceCountedObject.cpp
XalanReferenceCountedObject.hpp
XalanSimplePrefixResolver.cpp
XalanSimplePrefixResolver.hpp
XalanStdOutputStream.cpp XalanStdOutputStream.hpp
XalanToXercesTranscoderWrapper.cpp
XalanToXercesTranscoderWrapper.hpp
XalanTranscodingServices.cpp
XalanTranscodingServices.hpp
XalanUTF16Transcoder.cpp XalanUTF16Transcoder.hpp
XalanUnicode.hpp XalanXMLChar.cpp XalanXMLChar.hpp
Log:
Updates for new C++ namespace support.
Revision Changes Path
1.12 +15 -9 xml-xalan/c/src/PlatformSupport/ArenaAllocator.hpp
Index: ArenaAllocator.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/ArenaAllocator.hpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ArenaAllocator.hpp 22 Jul 2002 22:28:55 -0000 1.11
+++ ArenaAllocator.hpp 20 Nov 2002 02:27:13 -0000 1.12
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -69,6 +69,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
template<class Type>
class ArenaDeleteFunctor
{
@@ -220,13 +224,11 @@
virtual void
reset()
{
-#if !defined(XALAN_NO_NAMESPACES)
- using std::for_each;
-#endif
-
- for_each(m_blocks.begin(),
- m_blocks.end(),
- ArenaDeleteFunctor<ArenaBlockType>());
+
+ XALAN_STD_QUALIFIER for_each(
+ m_blocks.begin(),
+ m_blocks.end(),
+ ArenaDeleteFunctor<ArenaBlockType>());
m_blocks.clear();
}
@@ -234,7 +236,7 @@
protected:
// data members...
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
typedef vector<ArenaBlockType*> ArenaBlockListType;
#else
typedef std::vector<ArenaBlockType*> ArenaBlockListType;
@@ -252,6 +254,10 @@
ArenaAllocator<ObjectType, ArenaBlockType>&
operator=(const ArenaAllocator<ObjectType, ArenaBlockType>&);
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.15 +12 -16 xml-xalan/c/src/PlatformSupport/ArenaBlock.hpp
Index: ArenaBlock.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/ArenaBlock.hpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ArenaBlock.hpp 7 Mar 2002 04:00:57 -0000 1.14
+++ ArenaBlock.hpp 20 Nov 2002 02:27:13 -0000 1.15
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -73,6 +73,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
#if defined(XALAN_NO_SELECTIVE_TEMPLATE_INSTANTIATION)
template <class Type>
@@ -276,13 +280,9 @@
virtual bool
ownsObject(const ObjectType* theObject) const
{
-#if !defined(XALAN_NO_NAMESPACES)
- using std::less;
-#endif
-
// Use less<>, since it's guaranteed to do pointer
// comparisons correctly...
- less<const ObjectType*> functor;
+ XALAN_STD_QUALIFIER less<const ObjectType*> functor;
if (functor(theObject, m_objectBlock) == false &&
functor(theObject, m_objectBlock + m_objectCount) ==
true)
@@ -306,13 +306,9 @@
bool
ownsBlock(const ObjectType* theObject) const
{
-#if !defined(XALAN_NO_NAMESPACES)
- using std::less;
-#endif
-
// Use less<>, since it's guaranteed to do pointer
// comparisons correctly...
- less<const ObjectType*> functor;
+ XALAN_STD_QUALIFIER less<const ObjectType*> functor;
if (functor(theObject, m_objectBlock) == false &&
functor(theObject, m_objectBlock + m_blockSize) == true)
@@ -332,12 +328,8 @@
void
destroyAll()
{
-#if !defined(XALAN_NO_NAMESPACES)
- using std::for_each;
-#endif
-
// Destroy all existing objects...
- for_each(m_objectBlock,
+ XALAN_STD_QUALIFIER for_each(m_objectBlock,
m_objectBlock + m_objectCount,
DeleteFunctor(*this, m_destroyFunction));
@@ -444,6 +436,10 @@
AllocatorType m_allocator;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.23 +20 -29 xml-xalan/c/src/PlatformSupport/AttributeListImpl.cpp
Index: AttributeListImpl.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/AttributeListImpl.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- AttributeListImpl.cpp 22 Jul 2002 22:28:55 -0000 1.22
+++ AttributeListImpl.cpp 20 Nov 2002 02:27:13 -0000 1.23
@@ -73,8 +73,12 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
AttributeListImpl::AttributeListImpl() :
- AttributeList(),
+ ParentType(),
m_AttributeVector(),
m_cacheVector()
{
@@ -106,7 +110,7 @@
-AttributeListImpl::AttributeListImpl(const AttributeList& theSource) :
+AttributeListImpl::AttributeListImpl(const ParentType& theSource) :
AttributeList(),
m_AttributeVector()
{
@@ -121,14 +125,11 @@
void
AttributeListImpl::deleteEntries(AttributeVectorType& theVector)
{
-#if !defined(XALAN_NO_NAMESPACES)
- using std::for_each;
-#endif
-
// Delete all of the objects in the vector.
- for_each(theVector.begin(),
- theVector.end(),
- DeleteFunctor<AttributeVectorEntry>());
+ XALAN_STD_QUALIFIER for_each(
+ theVector.begin(),
+ theVector.end(),
+ DeleteFunctor<AttributeVectorEntry>());
}
@@ -189,7 +190,7 @@
AttributeListImpl&
-AttributeListImpl::operator=(const AttributeList& theRHS)
+AttributeListImpl::operator=(const ParentType& theRHS)
{
if (this != &theRHS)
{
@@ -298,12 +299,8 @@
{
assert(name != 0);
-#if !defined(XALAN_NO_NAMESPACES)
- using std::find_if;
-#endif
-
const AttributeVectorType::const_iterator i =
- find_if(
+ XALAN_STD_QUALIFIER find_if(
m_AttributeVector.begin(),
m_AttributeVector.end(),
NameCompareFunctor(name));
@@ -334,12 +331,8 @@
{
assert(name != 0);
-#if !defined(XALAN_NO_NAMESPACES)
- using std::find_if;
-#endif
-
const AttributeVectorType::const_iterator i =
- find_if(
+ XALAN_STD_QUALIFIER find_if(
m_AttributeVector.begin(),
m_AttributeVector.end(),
NameCompareFunctor(name));
@@ -380,10 +373,8 @@
bool fResult = false;
-#if !defined(XALAN_NO_NAMESPACES)
- using std::find_if;
- using std::copy;
-#endif
+ XALAN_USING_STD(find_if)
+ XALAN_USING_STD(copy)
typedef AttributeVectorEntry::XMLChVectorType XMLChVectorType;
@@ -490,15 +481,11 @@
{
assert(name != 0);
-#if !defined(XALAN_NO_NAMESPACES)
- using std::find_if;
-#endif
-
bool fResult = false;
// Update the attribute, if it's already there...
const AttributeVectorType::iterator i =
- find_if(
+ XALAN_STD_QUALIFIER find_if(
m_AttributeVector.begin(),
m_AttributeVector.end(),
NameCompareFunctor(name));
@@ -514,3 +501,7 @@
return fResult;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.17 +16 -5 xml-xalan/c/src/PlatformSupport/AttributeListImpl.hpp
Index: AttributeListImpl.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/AttributeListImpl.hpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- AttributeListImpl.hpp 9 Mar 2002 06:28:35 -0000 1.16
+++ AttributeListImpl.hpp 20 Nov 2002 02:27:13 -0000 1.17
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -72,14 +72,21 @@
+
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class AttributeVectorEntry;
-class XALAN_PLATFORMSUPPORT_EXPORT AttributeListImpl : public AttributeList
+class XALAN_PLATFORMSUPPORT_EXPORT AttributeListImpl : public
XERCES_CPP_NAMESPACE_QUALIFIER AttributeList
{
public:
+ typedef XERCES_CPP_NAMESPACE_QUALIFIER AttributeList ParentType;
+
explicit
AttributeListImpl();
@@ -88,13 +95,13 @@
AttributeListImpl(const AttributeListImpl& theSource);
- AttributeListImpl(const AttributeList& theSource);
+ AttributeListImpl(const ParentType& theSource);
AttributeListImpl&
operator=(const AttributeListImpl& theRHS);
AttributeListImpl&
- operator=(const AttributeList& theRHS);
+ operator=(const ParentType& theRHS);
// These are inherited from AttributeList
virtual unsigned int
@@ -171,7 +178,7 @@
m_AttributeVector.reserve(theCount);
}
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
// This vector will hold the entries.
typedef vector<AttributeVectorEntry*>
AttributeVectorType;
#else
@@ -222,6 +229,10 @@
AttributeVectorType m_cacheVector;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.3 +10 -2 xml-xalan/c/src/PlatformSupport/AttributeVectorEntry.hpp
Index: AttributeVectorEntry.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/AttributeVectorEntry.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AttributeVectorEntry.hpp 12 Apr 2002 04:45:54 -0000 1.2
+++ AttributeVectorEntry.hpp 20 Nov 2002 02:27:13 -0000 1.3
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -72,11 +72,15 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_PLATFORMSUPPORT_EXPORT AttributeVectorEntry
{
public:
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
typedef vector<XMLCh> XMLChVectorType;
#else
typedef std::vector<XMLCh> XMLChVectorType;
@@ -141,6 +145,10 @@
return data;
}
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.4 +9 -1
xml-xalan/c/src/PlatformSupport/AttributeVectorEntryExtended.hpp
Index: AttributeVectorEntryExtended.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/PlatformSupport/AttributeVectorEntryExtended.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AttributeVectorEntryExtended.hpp 12 Apr 2002 04:45:54 -0000 1.3
+++ AttributeVectorEntryExtended.hpp 20 Nov 2002 02:27:13 -0000 1.4
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -68,6 +68,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_PLATFORMSUPPORT_EXPORT AttributeVectorEntryExtended : public
AttributeVectorEntry
{
public:
@@ -130,6 +134,10 @@
XMLChVectorType m_uri;
XMLChVectorType m_localName;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.9 +19 -31 xml-xalan/c/src/PlatformSupport/AttributesImpl.cpp
Index: AttributesImpl.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/AttributesImpl.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- AttributesImpl.cpp 22 Jul 2002 22:28:55 -0000 1.8
+++ AttributesImpl.cpp 20 Nov 2002 02:27:13 -0000 1.9
@@ -73,8 +73,12 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
AttributesImpl::AttributesImpl() :
- Attributes(),
+ ParentType(),
m_attributesVector(),
m_cacheVector()
{
@@ -106,7 +110,7 @@
-AttributesImpl::AttributesImpl(const Attributes& theSource) :
+AttributesImpl::AttributesImpl(const ParentType& theSource) :
Attributes(),
m_attributesVector()
{
@@ -119,16 +123,13 @@
void
-AttributesImpl::deleteEntries(AttributesVectorType& theVector)
+AttributesImpl::deleteEntries(AttributesVectorType& theVector)
{
-#if !defined(XALAN_NO_NAMESPACES)
- using std::for_each;
-#endif
-
// Delete all of the objects in the vector.
- for_each(theVector.begin(),
- theVector.end(),
- DeleteFunctor<AttributeVectorEntryExtended>());
+ XALAN_STD_QUALIFIER for_each(
+ theVector.begin(),
+ theVector.end(),
+ DeleteFunctor<AttributeVectorEntryExtended>());
}
@@ -191,7 +192,7 @@
AttributesImpl&
-AttributesImpl::operator=(const Attributes& theRHS)
+AttributesImpl::operator=(const ParentType& theRHS)
{
if (this != &theRHS)
{
@@ -423,12 +424,8 @@
{
assert(uri != 0 && localName != 0);
-#if !defined(XALAN_NO_NAMESPACES)
- using std::find_if;
-#endif
-
const AttributesVectorType::const_iterator i =
- find_if(
+ XALAN_STD_QUALIFIER find_if(
m_attributesVector.begin(),
m_attributesVector.end(),
URIAndLocalNameCompareFunctor(uri, localName));
@@ -452,12 +449,8 @@
{
assert(qname != 0);
-#if !defined(XALAN_NO_NAMESPACES)
- using std::find_if;
-#endif
-
const AttributesVectorType::const_iterator i =
- find_if(
+ XALAN_STD_QUALIFIER find_if(
m_attributesVector.begin(),
m_attributesVector.end(),
NameCompareFunctor(qname));
@@ -499,11 +492,6 @@
assert(type != 0);
assert(value != 0);
-#if !defined(XALAN_NO_NAMESPACES)
- using std::find_if;
- using std::copy;
-#endif
-
typedef AttributeVectorEntry::XMLChVectorType XMLChVectorType;
if (m_attributesVector.capacity() == 0)
@@ -571,15 +559,11 @@
{
assert(name != 0);
-#if !defined(XALAN_NO_NAMESPACES)
- using std::find_if;
-#endif
-
bool fResult = false;
// Update the attribute, if it's already there...
const AttributesVectorType::iterator i =
- find_if(
+ XALAN_STD_QUALIFIER find_if(
m_attributesVector.begin(),
m_attributesVector.end(),
NameCompareFunctor(name));
@@ -595,3 +579,7 @@
return fResult;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.6 +16 -6 xml-xalan/c/src/PlatformSupport/AttributesImpl.hpp
Index: AttributesImpl.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/AttributesImpl.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AttributesImpl.hpp 9 Mar 2002 06:53:43 -0000 1.5
+++ AttributesImpl.hpp 20 Nov 2002 02:27:13 -0000 1.6
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -72,14 +72,20 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class AttributeVectorEntryExtended;
-class XALAN_PLATFORMSUPPORT_EXPORT AttributesImpl : public Attributes
+class XALAN_PLATFORMSUPPORT_EXPORT AttributesImpl : public
XERCES_CPP_NAMESPACE_QUALIFIER Attributes
{
public:
+ typedef XERCES_CPP_NAMESPACE_QUALIFIER Attributes ParentType;
+
explicit
AttributesImpl();
@@ -88,13 +94,13 @@
AttributesImpl(const AttributesImpl& theSource);
- AttributesImpl(const Attributes& theSource);
+ AttributesImpl(const ParentType& theSource);
AttributesImpl&
- operator=(const AttributesImpl& theRHS);
+ operator=(const AttributesImpl& theRHS);
AttributesImpl&
- operator=(const Attributes& theRHS);
+ operator=(const ParentType& theRHS);
// These are inherited from AttributeList
virtual unsigned int
@@ -216,7 +222,7 @@
m_attributesVector.reserve(theCount);
}
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
// This vector will hold the entries.
typedef vector<AttributeVectorEntryExtended*>
AttributesVectorType;
#else
@@ -288,6 +294,10 @@
AttributesVectorType m_cacheVector;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.80 +20 -47 xml-xalan/c/src/PlatformSupport/DOMStringHelper.cpp
Index: DOMStringHelper.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/DOMStringHelper.cpp,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- DOMStringHelper.cpp 14 Nov 2002 23:55:01 -0000 1.79
+++ DOMStringHelper.cpp 20 Nov 2002 02:27:13 -0000 1.80
@@ -100,6 +100,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
// The maximum number of digits that sprintf can put in a buffer.
// 100 for now. We're using this because we want to avoid transcoding
// number strings when we don't have to,
@@ -372,13 +376,11 @@
+XALAN_USING_STD(ostream)
+
XALAN_PLATFORMSUPPORT_EXPORT_FUNCTION(void)
OutputString(
-#if defined(XALAN_NO_NAMESPACES)
ostream& theStream,
-#else
- std::ostream& theStream,
-#endif
const CharVectorType& theString)
{
if (theString.empty() == false)
@@ -403,11 +405,7 @@
XALAN_PLATFORMSUPPORT_EXPORT_FUNCTION(void)
OutputString(
-#if defined(XALAN_NO_NAMESPACES)
ostream& theStream,
-#else
- std::ostream& theStream,
-#endif
const XalanDOMChar* theString)
{
OutputString(theStream, TranscodeToLocalCodePage(theString));
@@ -526,8 +524,6 @@
{
const XalanDOMString::size_type theStringLength =
length(theString);
- // $$$ ToDo: In Java-land, any failing of this
- // assertion would result in an exception being thrown.
assert(theStartIndex <= theStringLength);
if (theStartIndex == theStringLength)
@@ -570,11 +566,7 @@
theOutputIterator,
theFunction);
#else
-#if defined(XALAN_NO_NAMESPACES)
- return transform(
-#else
- return std::transform(
-#endif
+ return XALAN_STD_QUALIFIER transform(
theInputBegin,
theInputEnd,
theOutputIterator,
@@ -595,14 +587,10 @@
XalanDOMString theConvertedString;
-#if !defined(XALAN_NO_NAMESPACES)
- using std::back_inserter;
-#endif
-
TransformString(
theInputString,
theInputString + theInputStringLength,
- back_inserter(theConvertedString),
+ XALAN_STD_QUALIFIER back_inserter(theConvertedString),
theFunction);
return theConvertedString;
@@ -992,25 +980,14 @@
theResult.reserve(theLength);
-#if !defined(XALAN_NO_NAMESPACES)
- using std::back_inserter;
-#endif
-
#if defined(XALAN_NO_ALGORITHMS_WITH_BUILTINS)
XalanCopy(
- data,
- data + theLength,
- back_inserter(theResult));
#else
-#if defined(XALAN_NO_NAMESPACES)
- copy(
-#else
- std::copy(
+ XALAN_STD_QUALIFIER copy(
#endif
data,
data + theLength,
- back_inserter(theResult));
-#endif
+ XALAN_STD_QUALIFIER back_inserter(theResult));
}
return theResult;
@@ -1397,7 +1374,7 @@
char theBuffer[MAX_PRINTF_DIGITS + 1];
#if defined(XALAN_STRICT_ANSI_HEADERS)
- using std::sprintf;
+ XALAN_USING_STD(sprintf);
#endif
unsigned int theCharsWritten = sprintf(theBuffer, "%p", theValue);
@@ -1405,14 +1382,10 @@
reserve(theResult, length(theResult) + theCharsWritten);
-#if !defined(XALAN_NO_NAMESPACES)
- using std::back_inserter;
-#endif
-
TranscodeNumber(
theBuffer,
theBuffer + theCharsWritten,
- back_inserter(theResult));
+ XALAN_STD_QUALIFIER back_inserter(theResult));
return theResult;
}
@@ -1468,9 +1441,9 @@
char theBuffer[MAX_PRINTF_DIGITS + 1];
#if defined(XALAN_STRICT_ANSI_HEADERS)
- using std::sprintf;
- using std::atof;
- using std::isdigit;
+ XALAN_USING_STD(sprintf)
+ XALAN_USING_STD(atof)
+ XALAN_USING_STD(isdigit)
#endif
const char* const * thePrintfString =
thePrintfStrings;
@@ -1533,14 +1506,10 @@
reserve(theResult, length(theResult) + theCharsWritten);
-#if !defined(XALAN_NO_NAMESPACES)
- using std::back_inserter;
-#endif
-
TranscodeNumber(
theBuffer,
theBuffer + theCharsWritten,
- back_inserter(theResult));
+ XALAN_STD_QUALIFIER back_inserter(theResult));
}
return theResult;
@@ -1755,3 +1724,7 @@
return true;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.65 +27 -27 xml-xalan/c/src/PlatformSupport/DOMStringHelper.hpp
Index: DOMStringHelper.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/DOMStringHelper.hpp,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- DOMStringHelper.hpp 14 Nov 2002 23:55:01 -0000 1.64
+++ DOMStringHelper.hpp 20 Nov 2002 02:27:13 -0000 1.65
@@ -85,6 +85,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XalanOutputStream;
@@ -178,11 +182,7 @@
InputIteratorType end,
OutputIteratorType iterator)
{
-#if !defined(XALAN_NO_NAMESPACES)
- using std::copy;
-#endif
-
- return copy(begin, end, iterator);
+ return XALAN_STD_QUALIFIER copy(begin, end, iterator);
}
@@ -195,11 +195,7 @@
OutputIteratorType iterator,
UnaryFunction function)
{
-#if !defined(XALAN_NO_NAMESPACES)
- using std::transform;
-#endif
-
- return transform(begin, end, iterator);
+ return XALAN_STD_QUALIFIER transform(begin, end, iterator);
}
#endif
@@ -1025,7 +1021,7 @@
*/
XALAN_PLATFORMSUPPORT_EXPORT_FUNCTION(void)
OutputString(
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
ostream& theStream,
#else
std::ostream& theStream,
@@ -1057,7 +1053,7 @@
*/
XALAN_PLATFORMSUPPORT_EXPORT_FUNCTION(void)
OutputString(
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
ostream& theStream,
#else
std::ostream& theStream,
@@ -1095,7 +1091,7 @@
*/
inline void
OutputString(
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
ostream& theStream,
#else
std::ostream& theStream,
@@ -1133,7 +1129,7 @@
* @param theString the string to output
* @see OutputString
*/
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
inline ostream&
operator<<(
ostream& theStream,
@@ -1178,7 +1174,7 @@
* @param theString target string
* @see OutputString
*/
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
inline ostream&
operator<<(
ostream& theStream,
@@ -1224,7 +1220,7 @@
* @param theString target string
* @see OutputString
*/
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
inline ostream&
operator<<(
ostream& theStream,
@@ -2499,7 +2495,7 @@
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
struct c_wstr_functor : public unary_function<XalanDOMString, const
XalanDOMChar*>
#else
struct c_wstr_functor : public std::unary_function<XalanDOMString, const
XalanDOMChar*>
@@ -2520,7 +2516,7 @@
* @param theKey XalanDOMString to be hashed
* @return hash value for XalanDOMString
*/
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
struct DOMStringHashFunction : public unary_function<const XalanDOMString&,
size_t>
#else
struct DOMStringHashFunction : public std::unary_function<const
XalanDOMString&, size_t>
@@ -2556,7 +2552,7 @@
* @param theRHS second string to compare
* @return true if the contents of both strings are identical
*/
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
struct DOMStringEqualsFunction : public binary_function<const
XalanDOMString&, const XalanDOMString&, bool>
#else
struct DOMStringEqualsFunction : public std::binary_function<const
XalanDOMString&, const XalanDOMString&, bool>
@@ -2579,7 +2575,7 @@
* @param theRHS second string to compare
* @return true if the contents of both strings are identical
*/
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
struct DOMStringNotEqualsFunction : public binary_function<const
XalanDOMString&, const XalanDOMString&, bool>
#else
struct DOMStringNotEqualsFunction : public std::binary_function<const
XalanDOMString&, const XalanDOMString&, bool>
@@ -2602,7 +2598,7 @@
* @param theRHS second string to compare
* @return true if the theLHS is less than theRHSl
*/
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
struct DOMStringLessThanFunction : public binary_function<const
XalanDOMString&, const XalanDOMString&, bool>
#else
struct DOMStringLessThanFunction : public std::binary_function<const
XalanDOMString&, const XalanDOMString&, bool>
@@ -2625,7 +2621,7 @@
* @param theRHS second string to compare
* @return true if the theLHS is less than theRHSl
*/
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
struct DOMStringPointerLessThanFunction : public binary_function<const
XalanDOMString*, const XalanDOMString*, bool>
#else
struct DOMStringPointerLessThanFunction : public std::binary_function<const
XalanDOMString*, const XalanDOMString*, bool>
@@ -2650,7 +2646,7 @@
* @param theRHS second string to compare
* @return true if the theLHS is less than theRHS, without respect to case.
*/
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
struct DOMStringLessThanIgnoreCaseASCIIFunction : public
binary_function<const XalanDOMString&, const XalanDOMString&, bool>
#else
struct DOMStringLessThanIgnoreCaseASCIIFunction : public
std::binary_function<const XalanDOMString&, const XalanDOMString&, bool>
@@ -2673,7 +2669,7 @@
* @param theRHS second string to compare
* @return true if the theLHS is less than or equal to theRHS
*/
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
struct DOMStringLessThanOrEqualFunction : public binary_function<const
XalanDOMString&, const XalanDOMString&, bool>
#else
struct DOMStringLessThanOrEqualFunction : public std::binary_function<const
XalanDOMString&, const XalanDOMString&, bool>
@@ -2696,7 +2692,7 @@
* @param theRHS second string to compare
* @return true if the theLHS is greater than theRHS
*/
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
struct DOMStringGreaterThanFunction : public binary_function<const
XalanDOMString&, const XalanDOMString&, bool>
#else
struct DOMStringGreaterThanFunction : public std::binary_function<const
XalanDOMString&, const XalanDOMString&, bool>
@@ -2719,7 +2715,7 @@
* @param theRHS second string to compare
* @return true if the theLHS is greater than or equal to theRHS
*/
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
struct DOMStringGreaterThanOrEqualFunction : public binary_function<const
XalanDOMString&, const XalanDOMString&, bool>
#else
struct DOMStringGreaterThanOrEqualFunction : public
std::binary_function<const XalanDOMString&, const XalanDOMString&, bool>
@@ -2740,7 +2736,7 @@
* manner. It substitutes for the default less<type*> so that the contents
of wide strings
* can be compared, rather than just the pointers.
*/
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
struct less_no_case_ascii_wide_string : public binary_function<const
XalanDOMChar*, const XalanDOMChar*, bool>
#else
struct less_no_case_ascii_wide_string : public std::binary_function<const
XalanDOMChar*, const XalanDOMChar*, bool>
@@ -2805,6 +2801,10 @@
return isXMLWhitespace(theString, 0, length(theString));
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.15 +10 -7 xml-xalan/c/src/PlatformSupport/DOMStringPrintWriter.cpp
Index: DOMStringPrintWriter.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/DOMStringPrintWriter.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- DOMStringPrintWriter.cpp 6 May 2002 05:15:19 -0000 1.14
+++ DOMStringPrintWriter.cpp 20 Nov 2002 02:27:13 -0000 1.15
@@ -67,6 +67,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
DOMStringPrintWriter::DOMStringPrintWriter(XalanDOMString& theString) :
PrintWriter(true),
m_outputString(theString)
@@ -119,11 +123,6 @@
XalanDOMString::size_type theOffset,
XalanDOMString::size_type theLength)
{
-#if !defined(XALAN_NO_NAMESPACES)
- using std::vector;
- using std::copy;
-#endif
-
assert(s != 0);
append(m_outputString, (s + theOffset), theLength);
@@ -306,7 +305,7 @@
void
-DOMStringPrintWriter::println(int i)
+DOMStringPrintWriter::println(int i)
{
print(i);
@@ -326,9 +325,13 @@
void
-DOMStringPrintWriter::println(const XalanDOMString& s)
+DOMStringPrintWriter::println(const XalanDOMString& s)
{
print(s);
println();
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.11 +8 -3 xml-xalan/c/src/PlatformSupport/DOMStringPrintWriter.hpp
Index: DOMStringPrintWriter.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/DOMStringPrintWriter.hpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- DOMStringPrintWriter.hpp 27 Sep 2001 16:34:27 -0000 1.10
+++ DOMStringPrintWriter.hpp 20 Nov 2002 02:27:13 -0000 1.11
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -64,14 +64,15 @@
+#include <PlatformSupport/PrintWriter.hpp>
-#include <PlatformSupport/PrintWriter.hpp>
+#include <XalanDOM/XalanDOMString.hpp>
-#include <XalanDOM/XalanDOMString.hpp>
+XALAN_CPP_NAMESPACE_BEGIN
@@ -201,6 +202,10 @@
bool
operator==(const DOMStringPrintWriter&);
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.24 +22 -18 xml-xalan/c/src/PlatformSupport/DirectoryEnumerator.hpp
Index: DirectoryEnumerator.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/DirectoryEnumerator.hpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- DirectoryEnumerator.hpp 13 Apr 2001 02:52:41 -0000 1.23
+++ DirectoryEnumerator.hpp 20 Nov 2002 02:27:13 -0000 1.24
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -82,6 +82,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
#if defined(_MSC_VER)
class FindFileStruct : public _wfinddata_t
@@ -186,7 +190,7 @@
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
struct DirectoryFilterPredicate : public unary_function<FindFileStruct, bool>
#else
struct DirectoryFilterPredicate : public std::unary_function<FindFileStruct,
bool>
@@ -201,7 +205,7 @@
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
struct FilesOnlyFilterPredicate : public unary_function<FindFileStruct, bool>
#else
struct FilesOnlyFilterPredicate : public std::unary_function<FindFileStruct,
bool>
@@ -328,13 +332,13 @@
class StringType = XalanDOMString,
class FilterPredicateType = FilesOnlyFilterPredicate,
class StringConversionFunction = c_wstr_functor>
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
struct DirectoryEnumeratorFunctor : public unary_function<StringType,
CollectionType>
#else
struct DirectoryEnumeratorFunctor : public std::unary_function<StringType,
CollectionType>
#endif
{
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
typedef unary_function<StringType, CollectionType> BaseClassType;
#else
typedef std::unary_function<StringType, CollectionType> BaseClassType;
@@ -354,15 +358,14 @@
const argument_type& theFullSearchSpec,
CollectionType& theCollection) const
{
-#if !defined(XALAN_NO_NAMESPACES)
- using std::back_inserter;
-#endif
+ XALAN_USING_STD(back_inserter)
- EnumerateDirectory(theFullSearchSpec,
- back_inserter(theCollection),
- m_filterPredicate,
- m_conversionFunction,
- m_includeSelfAndParent);
+ EnumerateDirectory(
+ theFullSearchSpec,
+ XALAN_STD_QUALIFIER
back_inserter(theCollection),
+ m_filterPredicate,
+ m_conversionFunction,
+ m_includeSelfAndParent);
}
result_type
@@ -383,14 +386,10 @@
const argument_type& theSearchSpec,
CollectionType& theCollection) const
{
-#if !defined(XALAN_NO_NAMESPACES)
- using std::back_inserter;
-#endif
-
EnumerateDirectory(
theDirectory,
theSearchSpec,
- back_inserter(theCollection),
+ XALAN_STD_QUALIFIER
back_inserter(theCollection),
m_filterPredicate,
m_conversionFunction,
m_includeSelfAndParent);
@@ -420,6 +419,11 @@
const bool m_includeSelfAndParent;
};
#endif
+
+
+
+XALAN_CPP_NAMESPACE_END
+
#endif // DIRECTORY_ENUMERATOR_HEADER_GUARD_1357924680
1.37 +9 -0 xml-xalan/c/src/PlatformSupport/DoubleSupport.cpp
Index: DoubleSupport.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/DoubleSupport.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- DoubleSupport.cpp 14 Nov 2002 01:56:28 -0000 1.36
+++ DoubleSupport.cpp 20 Nov 2002 02:27:13 -0000 1.37
@@ -71,6 +71,11 @@
#include "XalanUnicode.hpp"
+
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
#if defined(XALAN_NO_STD_NUMERIC_LIMITS)
// To circumvent an OS/390 problem
#if !defined(OS390)
@@ -819,3 +824,7 @@
}
}
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.15 +21 -13 xml-xalan/c/src/PlatformSupport/DoubleSupport.hpp
Index: DoubleSupport.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/DoubleSupport.hpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- DoubleSupport.hpp 14 Nov 2002 00:08:10 -0000 1.14
+++ DoubleSupport.hpp 20 Nov 2002 02:27:13 -0000 1.15
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -72,6 +72,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
// A class to help us support IEEE 754.
class XALAN_PLATFORMSUPPORT_EXPORT DoubleSupport
{
@@ -373,7 +377,7 @@
// Some functors to do the same thing. This is for
// STL integration...
- #if defined(XALAN_NO_NAMESPACES)
+ #if defined(XALAN_NO_STD_NAMESPACE)
struct equalFunction : public binary_function<const double&, const
double&, bool>
#else
struct equalFunction : public std::binary_function<const double&, const
double&, bool>
@@ -388,7 +392,7 @@
}
};
- #if defined(XALAN_NO_NAMESPACES)
+ #if defined(XALAN_NO_STD_NAMESPACE)
struct notEqualFunction : public binary_function<const double&, const
double&, bool>
#else
struct notEqualFunction : public std::binary_function<const double&,
const double&, bool>
@@ -403,7 +407,7 @@
}
};
- #if defined(XALAN_NO_NAMESPACES)
+ #if defined(XALAN_NO_STD_NAMESPACE)
struct lessThanFunction : public binary_function<const double&, const
double&, bool>
#else
struct lessThanFunction : public std::binary_function<const double&,
const double&, bool>
@@ -418,7 +422,7 @@
}
};
- #if defined(XALAN_NO_NAMESPACES)
+ #if defined(XALAN_NO_STD_NAMESPACE)
struct lessThanOrEqualFunction : public binary_function<const double&,
const double&, bool>
#else
struct lessThanOrEqualFunction : public std::binary_function<const
double&, const double&, bool>
@@ -433,7 +437,7 @@
}
};
- #if defined(XALAN_NO_NAMESPACES)
+ #if defined(XALAN_NO_STD_NAMESPACE)
struct greaterThanFunction : public binary_function<const double&,
const double&, bool>
#else
struct greaterThanFunction : public std::binary_function<const double&,
const double&, bool>
@@ -448,7 +452,7 @@
}
};
- #if defined(XALAN_NO_NAMESPACES)
+ #if defined(XALAN_NO_STD_NAMESPACE)
struct greaterThanOrEqualFunction : public binary_function<const
double&, const double&, bool>
#else
struct greaterThanOrEqualFunction : public std::binary_function<const
double&, const double&, bool>
@@ -463,7 +467,7 @@
}
};
- #if defined(XALAN_NO_NAMESPACES)
+ #if defined(XALAN_NO_STD_NAMESPACE)
struct addFunction : public binary_function<const double&, const
double&, double>
#else
struct addFunction : public std::binary_function<const double&, const
double&, double>
@@ -478,7 +482,7 @@
}
};
- #if defined(XALAN_NO_NAMESPACES)
+ #if defined(XALAN_NO_STD_NAMESPACE)
struct subtractFunction : public binary_function<const double&, const
double&, double>
#else
struct subtractFunction : public std::binary_function<const double&,
const double&, double>
@@ -493,7 +497,7 @@
}
};
- #if defined(XALAN_NO_NAMESPACES)
+ #if defined(XALAN_NO_STD_NAMESPACE)
struct multiplyFunction : public binary_function<const double&, const
double&, double>
#else
struct multiplyFunction : public std::binary_function<const double&,
const double&, double>
@@ -508,7 +512,7 @@
}
};
- #if defined(XALAN_NO_NAMESPACES)
+ #if defined(XALAN_NO_STD_NAMESPACE)
struct divideFunction : public binary_function<const double&, const
double&, double>
#else
struct divideFunction : public std::binary_function<const double&,
const double&, double>
@@ -523,7 +527,7 @@
}
};
- #if defined(XALAN_NO_NAMESPACES)
+ #if defined(XALAN_NO_STD_NAMESPACE)
struct modulusFunction : public binary_function<const double&, const
double&, double>
#else
struct modulusFunction : public std::binary_function<const double&,
const double&, double>
@@ -538,7 +542,7 @@
}
};
- #if defined(XALAN_NO_NAMESPACES)
+ #if defined(XALAN_NO_STD_NAMESPACE)
struct negativeFunction : public unary_function<const double&, double>
#else
struct negativeFunction : public std::unary_function<const double&,
double>
@@ -623,6 +627,10 @@
static const DWORDPointerType
s_negativeZeroFirstDWORD;
static const UnalignedDWORDPointerType s_negativeZeroSecondDWORD;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +8 -0 xml-xalan/c/src/PlatformSupport/ExecutionContext.cpp
Index: ExecutionContext.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/ExecutionContext.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ExecutionContext.cpp 24 Jan 2000 20:25:22 -0000 1.1
+++ ExecutionContext.cpp 20 Nov 2002 02:27:13 -0000 1.2
@@ -59,6 +59,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
ExecutionContext::ExecutionContext()
{
}
@@ -68,3 +72,7 @@
ExecutionContext::~ExecutionContext()
{
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.7 +19 -11 xml-xalan/c/src/PlatformSupport/ExecutionContext.hpp
Index: ExecutionContext.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/ExecutionContext.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ExecutionContext.hpp 3 Nov 2002 03:29:52 -0000 1.6
+++ ExecutionContext.hpp 20 Nov 2002 02:27:13 -0000 1.7
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -64,15 +64,17 @@
-// $$$ ToDo: Needed for now, since XalanDOMString is still a typedef...
-#include <XalanDOM/XalanDOMString.hpp>
+XALAN_DECLARE_XERCES_CLASS(Locator)
-class Locator;
-class XalanNode;
+XALAN_CPP_NAMESPACE_BEGIN
+
+class XalanNode;
+class XalanDOMString;
+
//
// An abstract class which provides support for execution.
@@ -81,6 +83,8 @@
{
public:
+ typedef XERCES_CPP_NAMESPACE_QUALIFIER Locator LocatorType;
+
explicit
ExecutionContext();
@@ -98,7 +102,7 @@
error(
const XalanDOMString& msg,
const XalanNode* sourceNode = 0,
- const Locator* locator = 0) const = 0;
+ const LocatorType* locator = 0) const = 0;
/**
* Report an error and throw an exception.
@@ -111,7 +115,7 @@
error(
const char* msg,
const XalanNode* sourceNode = 0,
- const Locator* locator = 0) const = 0;
+ const LocatorType* locator = 0) const = 0;
/**
* Report a warning
@@ -124,7 +128,7 @@
warn(
const XalanDOMString& msg,
const XalanNode* sourceNode = 0,
- const Locator* locator = 0) const = 0;
+ const LocatorType* locator = 0) const = 0;
/**
* Report a warning
@@ -137,7 +141,7 @@
warn(
const char* msg,
const XalanNode* sourceNode = 0,
- const Locator* locator = 0) const = 0;
+ const LocatorType* locator = 0) const = 0;
/**
* Output a message.
@@ -150,7 +154,7 @@
message(
const XalanDOMString& msg,
const XalanNode* sourceNode = 0,
- const Locator* locator = 0) const = 0;
+ const LocatorType* locator = 0) const = 0;
/**
* Output a message.
@@ -163,8 +167,12 @@
message(
const char* msg,
const XalanNode* sourceNode = 0,
- const Locator* locator = 0) const = 0;
+ const LocatorType* locator = 0) const = 0;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.7 +10 -2 xml-xalan/c/src/PlatformSupport/FormatterListener.cpp
Index: FormatterListener.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/FormatterListener.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FormatterListener.cpp 19 Sep 2002 04:30:19 -0000 1.6
+++ FormatterListener.cpp 20 Nov 2002 02:27:13 -0000 1.7
@@ -73,8 +73,12 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
FormatterListener::FormatterListener(eFormat theFormat) :
- DocumentHandler(),
+ ParentType(),
m_prefixResolver(0),
m_outputFormat(theFormat)
{
@@ -115,3 +119,7 @@
const XalanDOMString::size_type
FormatterListener::s_piTargetLength;
const XalanDOMString::size_type
FormatterListener::s_piDataLength;
#endif
+
+
+
+XALAN_CPP_NAMESPACE_END
1.8 +18 -5 xml-xalan/c/src/PlatformSupport/FormatterListener.hpp
Index: FormatterListener.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/FormatterListener.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- FormatterListener.hpp 5 Sep 2002 01:38:37 -0000 1.7
+++ FormatterListener.hpp 20 Nov 2002 02:27:13 -0000 1.8
@@ -80,6 +80,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class PrefixResolver;
@@ -88,10 +92,15 @@
* A SAX-based formatter interface for the XSL processor. This interface
* will be called as result tree elements are constructed.
*/
-class XALAN_PLATFORMSUPPORT_EXPORT FormatterListener : public DocumentHandler
+class XALAN_PLATFORMSUPPORT_EXPORT FormatterListener : public
XERCES_CPP_NAMESPACE_QUALIFIER DocumentHandler
{
public:
+ typedef XERCES_CPP_NAMESPACE_QUALIFIER DocumentHandler ParentType;
+ typedef XERCES_CPP_NAMESPACE_QUALIFIER Locator
LocatorType;
+ typedef XERCES_CPP_NAMESPACE_QUALIFIER AttributeList
AttributeListType;
+
+
// A handy typedef... Must match DocumentHandler's type for
characters(), etc...
typedef unsigned int size_type;
@@ -225,7 +234,7 @@
resetDocument() = 0;
virtual void
- setDocumentLocator(const Locator* const locator) = 0;
+ setDocumentLocator(const LocatorType* const locator) = 0;
virtual void
startDocument() = 0;
@@ -233,7 +242,7 @@
virtual void
startElement(
const XMLCh* const name,
- AttributeList& attrs) = 0;
+ AttributeListType& attrs) = 0;
// Used when creating PI to work around limitations of
@@ -267,8 +276,12 @@
operator==(const FormatterListener&) const;
// Data membmers...
- const eFormat m_outputFormat;
+ const eFormat m_outputFormat;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.14 +9 -0
xml-xalan/c/src/PlatformSupport/NamedNodeMapAttributeList.cpp
Index: NamedNodeMapAttributeList.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/PlatformSupport/NamedNodeMapAttributeList.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- NamedNodeMapAttributeList.cpp 8 Feb 2001 21:38:59 -0000 1.13
+++ NamedNodeMapAttributeList.cpp 20 Nov 2002 02:27:13 -0000 1.14
@@ -68,6 +68,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
const XalanDOMChar NamedNodeMapAttributeList::s_typeString[] =
{
XalanUnicode::charLetter_C,
@@ -81,6 +85,7 @@
NamedNodeMapAttributeList::NamedNodeMapAttributeList(const
XalanNamedNodeMap& theMap) :
+ ParentType(),
m_nodeMap(theMap),
m_lastIndex(theMap.getLength() - 1)
{
@@ -191,3 +196,7 @@
{
return getValue(c_wstr(TranscodeFromLocalCodePage(name)));
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.9 +12 -2
xml-xalan/c/src/PlatformSupport/NamedNodeMapAttributeList.hpp
Index: NamedNodeMapAttributeList.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/PlatformSupport/NamedNodeMapAttributeList.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- NamedNodeMapAttributeList.hpp 23 Feb 2002 04:17:46 -0000 1.8
+++ NamedNodeMapAttributeList.hpp 20 Nov 2002 02:27:13 -0000 1.9
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -76,14 +76,20 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XalanNamedNodeMap;
-class XALAN_PLATFORMSUPPORT_EXPORT NamedNodeMapAttributeList : public
AttributeList
+class XALAN_PLATFORMSUPPORT_EXPORT NamedNodeMapAttributeList : public
XERCES_CPP_NAMESPACE_QUALIFIER AttributeList
{
public:
+ typedef XERCES_CPP_NAMESPACE_QUALIFIER AttributeList ParentType;
+
explicit
NamedNodeMapAttributeList(const XalanNamedNodeMap& theMap);
@@ -128,6 +134,10 @@
static const XalanDOMChar s_typeString[];
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.6 +8 -0 xml-xalan/c/src/PlatformSupport/NullPrintWriter.cpp
Index: NullPrintWriter.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/NullPrintWriter.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- NullPrintWriter.cpp 25 Sep 2001 21:12:51 -0000 1.5
+++ NullPrintWriter.cpp 20 Nov 2002 02:27:13 -0000 1.6
@@ -59,6 +59,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
NullPrintWriter::NullPrintWriter() :
PrintWriter(false)
{
@@ -259,3 +263,7 @@
NullPrintWriter::println(const XalanDOMString& /* s */)
{
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.7 +9 -1 xml-xalan/c/src/PlatformSupport/NullPrintWriter.hpp
Index: NullPrintWriter.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/NullPrintWriter.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- NullPrintWriter.hpp 27 Sep 2001 16:34:27 -0000 1.6
+++ NullPrintWriter.hpp 20 Nov 2002 02:27:13 -0000 1.7
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -69,6 +69,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_PLATFORMSUPPORT_EXPORT NullPrintWriter : public PrintWriter
{
public:
@@ -185,6 +189,10 @@
bool
operator==(const NullPrintWriter&);
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.3 +1 -1
xml-xalan/c/src/PlatformSupport/PlatformSupportDefinitions.hpp
Index: PlatformSupportDefinitions.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/PlatformSupport/PlatformSupportDefinitions.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PlatformSupportDefinitions.hpp 28 Jan 2000 14:59:22 -0000 1.2
+++ PlatformSupportDefinitions.hpp 20 Nov 2002 02:27:13 -0000 1.3
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
1.7 +8 -0 xml-xalan/c/src/PlatformSupport/PlatformSupportInit.cpp
Index: PlatformSupportInit.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/PlatformSupportInit.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- PlatformSupportInit.cpp 5 Sep 2002 01:11:31 -0000 1.6
+++ PlatformSupportInit.cpp 20 Nov 2002 02:27:13 -0000 1.7
@@ -63,6 +63,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
unsigned long PlatformSupportInit::s_initCounter = 0;
@@ -105,3 +109,7 @@
{
XalanTranscodingServices::terminate();
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +10 -1 xml-xalan/c/src/PlatformSupport/PlatformSupportInit.hpp
Index: PlatformSupportInit.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/PlatformSupportInit.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PlatformSupportInit.hpp 31 Aug 2000 19:42:51 -0000 1.1
+++ PlatformSupportInit.hpp 20 Nov 2002 02:27:13 -0000 1.2
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -68,6 +68,11 @@
#include <XalanDOM/XalanDOMInit.hpp>
+
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_PLATFORMSUPPORT_EXPORT PlatformSupportInit
{
public:
@@ -96,6 +101,10 @@
static unsigned long s_initCounter;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +8 -0 xml-xalan/c/src/PlatformSupport/PrefixResolver.cpp
Index: PrefixResolver.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/PrefixResolver.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PrefixResolver.cpp 29 Jun 2001 18:41:47 -0000 1.1
+++ PrefixResolver.cpp 20 Nov 2002 02:27:13 -0000 1.2
@@ -59,6 +59,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
PrefixResolver::PrefixResolver()
{
}
@@ -74,3 +78,7 @@
PrefixResolver::~PrefixResolver()
{
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.3 +9 -1 xml-xalan/c/src/PlatformSupport/PrefixResolver.hpp
Index: PrefixResolver.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/PrefixResolver.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PrefixResolver.hpp 5 Aug 2002 15:42:04 -0000 1.2
+++ PrefixResolver.hpp 20 Nov 2002 02:27:13 -0000 1.3
@@ -64,7 +64,11 @@
-#include <XalanDOM/XalanDOMString.hpp>
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
+class XalanDOMString;
@@ -102,6 +106,10 @@
virtual const XalanDOMString&
getURI() const = 0;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.4 +8 -0 xml-xalan/c/src/PlatformSupport/PrintWriter.cpp
Index: PrintWriter.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/PrintWriter.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PrintWriter.cpp 8 Feb 2001 21:39:03 -0000 1.3
+++ PrintWriter.cpp 20 Nov 2002 02:27:13 -0000 1.4
@@ -64,6 +64,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
const XalanDOMChar PrintWriter::s_trueString[] =
{
XalanUnicode::charLetter_t,
@@ -104,3 +108,7 @@
PrintWriter::~PrintWriter()
{
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.13 +9 -1 xml-xalan/c/src/PlatformSupport/PrintWriter.hpp
Index: PrintWriter.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/PrintWriter.hpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- PrintWriter.hpp 27 Sep 2001 16:34:27 -0000 1.12
+++ PrintWriter.hpp 20 Nov 2002 02:27:13 -0000 1.13
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -69,6 +69,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_PLATFORMSUPPORT_EXPORT PrintWriter : public Writer
{
public:
@@ -210,6 +214,10 @@
bool
operator==(const PrintWriter&);
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +9 -1 xml-xalan/c/src/PlatformSupport/Resettable.cpp
Index: Resettable.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/Resettable.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Resettable.cpp 18 Dec 1999 19:47:50 -0000 1.1
+++ Resettable.cpp 20 Nov 2002 02:27:13 -0000 1.2
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -58,6 +58,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
Resettable::Resettable()
{
}
@@ -67,3 +71,7 @@
Resettable::~Resettable()
{
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +9 -1 xml-xalan/c/src/PlatformSupport/Resettable.hpp
Index: Resettable.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/Resettable.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Resettable.hpp 18 Dec 1999 19:47:50 -0000 1.1
+++ Resettable.hpp 20 Nov 2002 02:27:13 -0000 1.2
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -64,6 +64,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_PLATFORMSUPPORT_EXPORT Resettable
{
public:
@@ -79,6 +83,10 @@
virtual void
reset() = 0;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.15 +10 -3
xml-xalan/c/src/PlatformSupport/ReusableArenaAllocator.hpp
Index: ReusableArenaAllocator.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/PlatformSupport/ReusableArenaAllocator.hpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ReusableArenaAllocator.hpp 22 Jul 2002 22:28:55 -0000 1.14
+++ ReusableArenaAllocator.hpp 20 Nov 2002 02:27:13 -0000 1.15
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -70,6 +70,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
template<class ObjectType>
class ReusableArenaAllocator : public ArenaAllocator<ObjectType,
ReusableArenaBlock<ObjectType> >
@@ -83,8 +87,7 @@
typedef ArenaAllocator<ObjectType,
ReusableArenaBlockType>
BaseClassType;
- // $$$ ToDo: This typedef is here because of a bug in gcc.
-#if defined (XALAN_NO_NAMESPACES)
+#if defined (XALAN_NO_STD_NAMESPACE)
typedef vector<ReusableArenaBlockType*>
ArenaBlockListType;
#else
typedef std::vector<ReusableArenaBlockType*>
ArenaBlockListType;
@@ -262,6 +265,10 @@
// Data members...
ReusableArenaBlockType* m_lastBlockReferenced;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.10 +9 -1 xml-xalan/c/src/PlatformSupport/ReusableArenaBlock.hpp
Index: ReusableArenaBlock.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/ReusableArenaBlock.hpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ReusableArenaBlock.hpp 25 Sep 2002 20:25:25 -0000 1.9
+++ ReusableArenaBlock.hpp 20 Nov 2002 02:27:13 -0000 1.10
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -66,6 +66,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
template<class ObjectType>
class ReusableArenaBlock : public ArenaBlock<ObjectType>
{
@@ -316,6 +320,10 @@
// The number of blocks on the free list.)
size_type m_freeBlockCount;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.20 +8 -8 xml-xalan/c/src/PlatformSupport/StdBinInputStream.cpp
Index: StdBinInputStream.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/StdBinInputStream.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- StdBinInputStream.cpp 14 Nov 2002 23:55:02 -0000 1.19
+++ StdBinInputStream.cpp 20 Nov 2002 02:27:13 -0000 1.20
@@ -71,16 +71,12 @@
-#if !defined(XALAN_NO_NAMESPACES)
-using std::cin;
-using std::istream;
-#endif
+XALAN_CPP_NAMESPACE_BEGIN
+
-StdBinInputStream::StdBinInputStream(
- istream& theStream,
- bool fBlockingRead) :
- BinInputStream(),
+StdBinInputStream::StdBinInputStream(StreamType& theStream) :
+ ParentType(),
m_stream(theStream)
{
}
@@ -127,3 +123,7 @@
return m_stream.gcount();
}
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.11 +17 -12 xml-xalan/c/src/PlatformSupport/StdBinInputStream.hpp
Index: StdBinInputStream.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/StdBinInputStream.hpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- StdBinInputStream.hpp 14 Nov 2002 23:55:02 -0000 1.10
+++ StdBinInputStream.hpp 20 Nov 2002 02:27:13 -0000 1.11
@@ -80,20 +80,25 @@
-class XALAN_PLATFORMSUPPORT_EXPORT StdBinInputStream : public BinInputStream
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
+class XALAN_PLATFORMSUPPORT_EXPORT StdBinInputStream : public
XERCES_CPP_NAMESPACE_QUALIFIER BinInputStream
{
public:
-#if defined(XALAN_NO_NAMESPACES)
- StdBinInputStream(
- istream& theStream,
+ typedef XERCES_CPP_NAMESPACE_QUALIFIER BinInputStream ParentType;
+
+#if defined(XALAN_NO_STD_NAMESPACE)
+ typedef istream StreamType;
#else
- StdBinInputStream(
- std::istream& theStream,
+ typedef std::istream StreamType;
#endif
- bool fBlockingRead = false);
+ StdBinInputStream(StreamType& theStream);
+
virtual
~StdBinInputStream();
@@ -118,12 +123,12 @@
// Data members...
-#if defined(XALAN_NO_NAMESPACES)
- istream& m_stream;
-#else
- std::istream& m_stream;
-#endif
+ StreamType& m_stream;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.11 +8 -0 xml-xalan/c/src/PlatformSupport/StringTokenizer.cpp
Index: StringTokenizer.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/StringTokenizer.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- StringTokenizer.cpp 31 Oct 2002 07:09:32 -0000 1.10
+++ StringTokenizer.cpp 20 Nov 2002 02:27:13 -0000 1.11
@@ -68,6 +68,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
const XalanDOMChar StringTokenizer::s_defaultTokens[] =
{
XalanUnicode::charSpace,
@@ -317,3 +321,7 @@
return theIndex;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.12 +8 -0 xml-xalan/c/src/PlatformSupport/StringTokenizer.hpp
Index: StringTokenizer.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/StringTokenizer.hpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- StringTokenizer.hpp 31 Oct 2002 07:09:32 -0000 1.11
+++ StringTokenizer.hpp 20 Nov 2002 02:27:13 -0000 1.12
@@ -72,6 +72,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_PLATFORMSUPPORT_EXPORT StringTokenizer
{
public:
@@ -193,6 +197,10 @@
const XalanDOMString::size_type m_tokensLength;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.21 +18 -10 xml-xalan/c/src/PlatformSupport/URISupport.cpp
Index: URISupport.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/URISupport.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- URISupport.cpp 10 May 2002 21:11:46 -0000 1.20
+++ URISupport.cpp 20 Nov 2002 02:27:13 -0000 1.21
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -75,6 +75,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
const XalanDOMChar URISupport::s_fileProtocolString1[] =
{
XalanUnicode::charLetter_f,
@@ -107,7 +111,7 @@
URISupport::URLAutoPtrType
URISupport::getURLFromString(const XalanDOMChar* urlString)
{
- URLAutoPtrType url(new XMLURL);
+ URLAutoPtrType url(new XMLURLType);
url->setURL(getURLStringFromString(urlString).c_str());
@@ -136,10 +140,10 @@
const XalanDOMString theProtocolString(urlString,
index);
// $$$ ToDo: XMLURL::lookupByName() is supposed to be
static, but is not.
- const XMLURL::Protocols theProtocol =
-
XMLURL().lookupByName(c_wstr(theProtocolString));
+ const XMLURLType::Protocols theProtocol =
+
XMLURLType().lookupByName(c_wstr(theProtocolString));
- if (theProtocol != XMLURL::Unknown)
+ if (theProtocol != XMLURLType::Unknown)
{
protocolPresent = true;
}
@@ -153,6 +157,8 @@
}
else
{
+ XALAN_USING(xercesc, XMLPlatformUtils)
+
// Assume it's a file specification...
const XalanArrayAutoPtr<XalanDOMChar>
theFullPathGuard(XMLPlatformUtils::getFullPath(c_wstr(urlString)));
@@ -198,6 +204,8 @@
XalanDOMString::size_type baseLen,
XalanDOMString&
theNormalizedURI)
{
+ XALAN_USING(xercesc, XMLURL)
+
XalanDOMString context(base, baseLen);
NormalizeURIText(context);
@@ -295,10 +303,6 @@
XalanDOMString&
URISupport::NormalizeURIText(XalanDOMString& uriString)
{
-#if !defined(XALAN_NO_NAMESPACES)
- using std::replace;
-#endif
-
// OK, look for a quick, cheap exit...
const XalanDOMString::size_type len = length(uriString);
const XalanDOMString::size_type index = indexOf(uriString,
XalanUnicode::charReverseSolidus);
@@ -307,7 +311,7 @@
{
// Start replacing at the index point, since that's the
// first one...
- replace(
+ XALAN_STD_QUALIFIER replace(
uriString.begin() + index,
uriString.end(),
XalanDOMChar(XalanUnicode::charReverseSolidus),
@@ -342,3 +346,7 @@
URISupport::InvalidURIException::~InvalidURIException()
{
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.10 +14 -4 xml-xalan/c/src/PlatformSupport/URISupport.hpp
Index: URISupport.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/URISupport.hpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- URISupport.hpp 10 May 2002 21:11:46 -0000 1.9
+++ URISupport.hpp 20 Nov 2002 02:27:13 -0000 1.10
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -80,11 +80,17 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_PLATFORMSUPPORT_EXPORT URISupport
{
public:
- typedef XalanAutoPtr<XMLURL> URLAutoPtrType;
+ typedef XERCES_CPP_NAMESPACE_QUALIFIER XMLURL XMLURLType;
+
+ typedef XalanAutoPtr<XMLURLType> URLAutoPtrType;
/**
* Determine the fully qualified URI for a string.
@@ -107,7 +113,7 @@
static void
getURLFromString(
const XalanDOMString& urlString,
- XMLURL& url)
+ XMLURLType& url)
{
getURLFromString(urlString.c_str(), url);
}
@@ -130,7 +136,7 @@
static void
getURLFromString(
const XalanDOMChar* urlString,
- XMLURL& url)
+ XMLURLType& url)
{
url.setURL(getURLStringFromString(urlString).c_str());
}
@@ -378,6 +384,10 @@
static const XalanDOMChar s_fileProtocolString2[];
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.7 +8 -0 xml-xalan/c/src/PlatformSupport/Writer.cpp
Index: Writer.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/Writer.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Writer.cpp 19 Sep 2002 04:30:20 -0000 1.6
+++ Writer.cpp 20 Nov 2002 02:27:13 -0000 1.7
@@ -59,6 +59,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
#if !defined(XALAN_INLINE_INITIALIZATION)
const size_t Writer::npos = ~0u;
#elif !defined(XALAN_INLINE_INITIALIZATION_IS_DEFINITION_BUG)
@@ -92,3 +96,7 @@
{
return 0;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.14 +9 -1 xml-xalan/c/src/PlatformSupport/Writer.hpp
Index: Writer.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/Writer.hpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Writer.hpp 27 Sep 2001 16:45:24 -0000 1.13
+++ Writer.hpp 20 Nov 2002 02:27:13 -0000 1.14
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -72,6 +72,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XalanOutputStream;
@@ -176,6 +180,10 @@
bool
operator==(const Writer&);
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.8 +9 -1 xml-xalan/c/src/PlatformSupport/XSLException.cpp
Index: XSLException.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/XSLException.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XSLException.cpp 10 Jul 2002 00:28:03 -0000 1.7
+++ XSLException.cpp 20 Nov 2002 02:27:13 -0000 1.8
@@ -68,6 +68,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XSLException::XSLException(
const XalanDOMString& theMessage,
const XalanDOMString& theURI,
@@ -85,7 +89,7 @@
XSLException::XSLException(
- const Locator& theLocator,
+ const LocatorType& theLocator,
const XalanDOMString& theMessage,
const XalanDOMString& theType) :
m_message(theMessage),
@@ -200,3 +204,7 @@
LongToDOMString(theColumnNumber, theBuffer);
theBuffer += XalanDOMChar(XalanUnicode::charRightParenthesis);
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.10 +12 -2 xml-xalan/c/src/PlatformSupport/XSLException.hpp
Index: XSLException.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/XSLException.hpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- XSLException.hpp 10 Jul 2002 00:28:03 -0000 1.9
+++ XSLException.hpp 20 Nov 2002 02:27:13 -0000 1.10
@@ -69,11 +69,17 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_PLATFORMSUPPORT_EXPORT XSLException
{
public:
- typedef XalanLocator::size_type size_type;
+ typedef XERCES_CPP_NAMESPACE_QUALIFIER Locator LocatorType;
+
+ typedef XalanLocator::size_type
size_type;
/**
* Constructor
@@ -99,7 +105,7 @@
* @param theType type of exception, default is "XSLException"
*/
XSLException(
- const Locator& theLocator,
+ const LocatorType& theLocator,
const XalanDOMString& theMessage,
const XalanDOMString& theType =
XalanDOMString(XALAN_STATIC_UCODE_STRING("XSLException")));
@@ -196,6 +202,10 @@
const XalanDOMString m_type;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +9 -1 xml-xalan/c/src/PlatformSupport/XalanAllocator.hpp
Index: XalanAllocator.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/XalanAllocator.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XalanAllocator.hpp 22 Aug 2000 20:18:30 -0000 1.1
+++ XalanAllocator.hpp 20 Nov 2002 02:27:13 -0000 1.2
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -64,6 +64,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
template <class Type>
class XalanAllocator
{
@@ -136,6 +140,10 @@
p->Type::~Type();
}
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.8 +9 -1 xml-xalan/c/src/PlatformSupport/XalanArrayAllocator.hpp
Index: XalanArrayAllocator.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/XalanArrayAllocator.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XalanArrayAllocator.hpp 3 Nov 2002 03:30:17 -0000 1.7
+++ XalanArrayAllocator.hpp 20 Nov 2002 02:27:13 -0000 1.8
@@ -70,12 +70,16 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
template<class Type>
class XALAN_PLATFORMSUPPORT_EXPORT XalanArrayAllocator
{
public:
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
typedef vector<Type> VectorType;
typedef typename VectorType::size_type size_type;
typedef pair<size_type, VectorType> ListEntryType;
@@ -290,6 +294,10 @@
ListEntryType* m_lastEntryFound;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.6 +10 -6 xml-xalan/c/src/PlatformSupport/XalanBitmap.cpp
Index: XalanBitmap.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/XalanBitmap.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XalanBitmap.cpp 25 Sep 2001 21:12:51 -0000 1.5
+++ XalanBitmap.cpp 20 Nov 2002 02:27:13 -0000 1.6
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -63,6 +63,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
// Pre-constructed masks for bit twiddling. Update these if not using chars
for storing the bits.
static const int theSetMasks[XalanBitmap::eBitsPerUnit] = { 1, 2, 4, 8,
16, 32, 64, 128 };
static const int theClearMasks[XalanBitmap::eBitsPerUnit] = { ~1, ~2,
~4, ~8, ~16, ~32, ~64, ~128 };
@@ -134,9 +138,9 @@
void
XalanBitmap::clearAll()
{
-#if !defined(XALAN_NO_NAMESPACES)
- using std::fill;
-#endif
-
- fill(m_bitmap.begin(), m_bitmap.end(), 0);
+ XALAN_STD_QUALIFIER fill(m_bitmap.begin(), m_bitmap.end(), 0);
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.4 +10 -2 xml-xalan/c/src/PlatformSupport/XalanBitmap.hpp
Index: XalanBitmap.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/XalanBitmap.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XalanBitmap.hpp 25 Sep 2001 21:12:51 -0000 1.3
+++ XalanBitmap.hpp 20 Nov 2002 02:27:13 -0000 1.4
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -68,6 +68,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_PLATFORMSUPPORT_EXPORT XalanBitmap
{
public:
@@ -149,7 +153,7 @@
private:
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
typedef vector<UnitType> BitmapVectorType;
#else
typedef std::vector<UnitType> BitmapVectorType;
@@ -159,6 +163,10 @@
BitmapVectorType m_bitmap;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +8 -0
xml-xalan/c/src/PlatformSupport/XalanDOMStringAllocator.cpp
Index: XalanDOMStringAllocator.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/PlatformSupport/XalanDOMStringAllocator.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XalanDOMStringAllocator.cpp 19 Apr 2002 05:23:15 -0000 1.1
+++ XalanDOMStringAllocator.cpp 20 Nov 2002 02:27:13 -0000 1.2
@@ -60,6 +60,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XalanDOMStringAllocator::XalanDOMStringAllocator(size_type theBlockCount) :
m_allocator(theBlockCount)
{
@@ -139,3 +143,7 @@
return theResult;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.4 +8 -0
xml-xalan/c/src/PlatformSupport/XalanDOMStringAllocator.hpp
Index: XalanDOMStringAllocator.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/PlatformSupport/XalanDOMStringAllocator.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XalanDOMStringAllocator.hpp 8 May 2002 00:54:45 -0000 1.3
+++ XalanDOMStringAllocator.hpp 20 Nov 2002 02:27:13 -0000 1.4
@@ -73,6 +73,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_PLATFORMSUPPORT_EXPORT XalanDOMStringAllocator
{
public:
@@ -214,6 +218,10 @@
// Data members...
ArenaAllocatorType m_allocator;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.4 +13 -9 xml-xalan/c/src/PlatformSupport/XalanDOMStringCache.cpp
Index: XalanDOMStringCache.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/XalanDOMStringCache.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XalanDOMStringCache.cpp 22 Jul 2002 22:28:55 -0000 1.3
+++ XalanDOMStringCache.cpp 20 Nov 2002 02:27:13 -0000 1.4
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -68,6 +68,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XalanDOMStringCache::XalanDOMStringCache(unsigned int theMaximumSize)
:
m_availableList(),
m_busyList(),
@@ -106,9 +110,7 @@
bool
XalanDOMStringCache::release(XalanDOMString& theString)
{
-#if !defined(XALAN_NO_NAMESPACES)
- using std::find;
-#endif
+ XALAN_USING_STD(find)
StringListType::iterator i =
find(m_busyList.begin(),
@@ -127,7 +129,7 @@
}
else
{
- ::clear(theString);
+ theString.erase();
m_availableList.push_back(*i);
}
@@ -143,9 +145,7 @@
void
XalanDOMStringCache::clear()
{
-#if !defined(XALAN_NO_NAMESPACES)
- using std::for_each;
-#endif
+ XALAN_USING_STD(for_each)
for_each(m_busyList.begin(),
m_busyList.end(),
@@ -178,7 +178,7 @@
}
else
{
- ::clear(*m_busyList.back());
+ m_busyList.back()->clear();
m_availableList.push_back(m_busyList.back());
}
@@ -186,3 +186,7 @@
m_busyList.pop_back();
}
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +10 -2 xml-xalan/c/src/PlatformSupport/XalanDOMStringCache.hpp
Index: XalanDOMStringCache.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/XalanDOMStringCache.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XalanDOMStringCache.hpp 20 Nov 2000 19:56:05 -0000 1.1
+++ XalanDOMStringCache.hpp 20 Nov 2002 02:27:13 -0000 1.2
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -73,13 +73,17 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_PLATFORMSUPPORT_EXPORT XalanDOMStringCache
{
public:
enum { eDefaultMaximumSize = 100 };
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
typedef vector<XalanDOMString*> StringListType;
#else
typedef std::vector<XalanDOMString*> StringListType;
@@ -174,6 +178,10 @@
unsigned int m_maximumSize;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.6 +9 -3
xml-xalan/c/src/PlatformSupport/XalanDOMStringHashTable.cpp
Index: XalanDOMStringHashTable.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/PlatformSupport/XalanDOMStringHashTable.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XalanDOMStringHashTable.cpp 22 Jul 2002 22:28:55 -0000 1.5
+++ XalanDOMStringHashTable.cpp 20 Nov 2002 02:27:13 -0000 1.6
@@ -68,6 +68,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XalanDOMStringHashTable::XalanDOMStringHashTable(
size_t theBucketCount,
size_t theBucketSize) :
@@ -216,9 +220,7 @@
*theBucketIndex = theLocalBucketIndex;
}
-#if !defined(XALAN_NO_NAMESPACES)
- using std::find_if;
-#endif
+ XALAN_USING_STD(find_if)
const BucketType::const_iterator i =
find_if(
@@ -288,3 +290,7 @@
++m_count;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.4 +10 -2
xml-xalan/c/src/PlatformSupport/XalanDOMStringHashTable.hpp
Index: XalanDOMStringHashTable.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/PlatformSupport/XalanDOMStringHashTable.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XalanDOMStringHashTable.hpp 9 Mar 2002 08:40:50 -0000 1.3
+++ XalanDOMStringHashTable.hpp 20 Nov 2002 02:27:13 -0000 1.4
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -76,11 +76,15 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_PLATFORMSUPPORT_EXPORT XalanDOMStringHashTable
{
public:
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
typedef vector<const XalanDOMString*> BucketType;
typedef BucketType::size_type bucket_size_type;
typedef vector<bucket_size_type> BucketCountsType;
@@ -266,6 +270,10 @@
unsigned int m_collisions;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.14 +8 -0 xml-xalan/c/src/PlatformSupport/XalanDOMStringPool.cpp
Index: XalanDOMStringPool.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/XalanDOMStringPool.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- XalanDOMStringPool.cpp 19 Apr 2002 05:23:32 -0000 1.13
+++ XalanDOMStringPool.cpp 20 Nov 2002 02:27:13 -0000 1.14
@@ -60,6 +60,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
const XalanDOMString XalanDOMStringPool::s_emptyString;
@@ -155,3 +159,7 @@
}
}
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.11 +9 -1 xml-xalan/c/src/PlatformSupport/XalanDOMStringPool.hpp
Index: XalanDOMStringPool.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/XalanDOMStringPool.hpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- XalanDOMStringPool.hpp 19 Apr 2002 05:23:32 -0000 1.10
+++ XalanDOMStringPool.hpp 20 Nov 2002 02:27:13 -0000 1.11
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -76,6 +76,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_PLATFORMSUPPORT_EXPORT XalanDOMStringPool
{
public:
@@ -174,6 +178,10 @@
static const XalanDOMString s_emptyString;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.4 +8 -0 xml-xalan/c/src/PlatformSupport/XalanDecimalFormat.cpp
Index: XalanDecimalFormat.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/XalanDecimalFormat.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XalanDecimalFormat.cpp 25 Sep 2001 21:12:51 -0000 1.3
+++ XalanDecimalFormat.cpp 20 Nov 2002 02:27:14 -0000 1.4
@@ -59,6 +59,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
const XalanDOMString XalanDecimalFormat::s_defaultPatternString;
@@ -228,3 +232,7 @@
return theNewPattern;
}
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.3 +10 -1 xml-xalan/c/src/PlatformSupport/XalanDecimalFormat.hpp
Index: XalanDecimalFormat.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/XalanDecimalFormat.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XalanDecimalFormat.hpp 14 Jun 2001 19:04:03 -0000 1.2
+++ XalanDecimalFormat.hpp 20 Nov 2002 02:27:14 -0000 1.3
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -74,6 +74,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_PLATFORMSUPPORT_EXPORT XalanDecimalFormat : public
XalanNumberFormat
{
public:
@@ -189,6 +193,11 @@
static const XalanDOMString s_defaultPatternString;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
+
#endif // XALANDECIMALFORMAT_HEADER_GUARD_1357924680
1.5 +8 -0
xml-xalan/c/src/PlatformSupport/XalanDecimalFormatSymbols.cpp
Index: XalanDecimalFormatSymbols.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/PlatformSupport/XalanDecimalFormatSymbols.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XalanDecimalFormatSymbols.cpp 24 Nov 2001 01:32:00 -0000 1.4
+++ XalanDecimalFormatSymbols.cpp 20 Nov 2002 02:27:14 -0000 1.5
@@ -60,6 +60,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
static XalanDOMChar theNaNDefault[] =
{
XalanUnicode::charLetter_N,
@@ -180,3 +184,7 @@
m_perMill == theRHS.m_perMill &&
m_zeroDigit == theRHS.m_zeroDigit;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.4 +9 -1
xml-xalan/c/src/PlatformSupport/XalanDecimalFormatSymbols.hpp
Index: XalanDecimalFormatSymbols.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/PlatformSupport/XalanDecimalFormatSymbols.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XalanDecimalFormatSymbols.hpp 24 Nov 2001 01:32:00 -0000 1.3
+++ XalanDecimalFormatSymbols.hpp 20 Nov 2002 02:27:14 -0000 1.4
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -72,6 +72,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_PLATFORMSUPPORT_EXPORT XalanDecimalFormatSymbols
{
public:
@@ -466,6 +470,10 @@
XalanDOMChar m_perMill;
XalanDOMChar m_zeroDigit;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +8 -0
xml-xalan/c/src/PlatformSupport/XalanEncodingPropertyCache.cpp
Index: XalanEncodingPropertyCache.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/PlatformSupport/XalanEncodingPropertyCache.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XalanEncodingPropertyCache.cpp 23 Feb 2002 04:18:36 -0000 1.1
+++ XalanEncodingPropertyCache.cpp 20 Nov 2002 02:27:14 -0000 1.2
@@ -60,6 +60,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XalanEncodingPropertyCache::XalanEncodingPropertyCache(
size_t
theCacheSize,
const XalanOutputTranscoder* theTranscoder) :
@@ -117,3 +121,7 @@
}
}
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +8 -0
xml-xalan/c/src/PlatformSupport/XalanEncodingPropertyCache.hpp
Index: XalanEncodingPropertyCache.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/PlatformSupport/XalanEncodingPropertyCache.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XalanEncodingPropertyCache.hpp 23 Feb 2002 04:18:36 -0000 1.1
+++ XalanEncodingPropertyCache.hpp 20 Nov 2002 02:27:14 -0000 1.2
@@ -71,6 +71,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XalanOutputTranscoder;
@@ -108,6 +112,10 @@
mutable XalanBitmap m_valueBitmap;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.12 +8 -0 xml-xalan/c/src/PlatformSupport/XalanFileOutputStream.cpp
Index: XalanFileOutputStream.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/PlatformSupport/XalanFileOutputStream.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- XalanFileOutputStream.cpp 31 Jul 2002 04:44:01 -0000 1.11
+++ XalanFileOutputStream.cpp 20 Nov 2002 02:27:14 -0000 1.12
@@ -71,6 +71,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
static XalanFileOutputStream::HandleType
openFile(const XalanDOMString& theFileName)
{
@@ -288,3 +292,7 @@
XalanFileOutputStream::XalanFileOutputStreamWriteException::~XalanFileOutputStreamWriteException()
{
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.6 +9 -1 xml-xalan/c/src/PlatformSupport/XalanFileOutputStream.hpp
Index: XalanFileOutputStream.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/PlatformSupport/XalanFileOutputStream.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XalanFileOutputStream.hpp 26 Nov 2001 23:03:18 -0000 1.5
+++ XalanFileOutputStream.hpp 20 Nov 2002 02:27:14 -0000 1.6
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -79,6 +79,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_PLATFORMSUPPORT_EXPORT XalanFileOutputStream : public
XalanOutputStream
{
public :
@@ -170,6 +174,10 @@
const HandleType m_handle;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +11 -1 xml-xalan/c/src/PlatformSupport/XalanLocator.hpp
Index: XalanLocator.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/XalanLocator.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XalanLocator.hpp 10 Jul 2002 00:23:44 -0000 1.1
+++ XalanLocator.hpp 20 Nov 2002 02:27:14 -0000 1.2
@@ -68,14 +68,20 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
/**
* This class defines a base class for Locator derivations in Xalan. It was
defined
* because Xerces made changes in their Locator class which caused
turbulence.
*/
-class XALAN_PLATFORMSUPPORT_EXPORT XalanLocator : public Locator
+class XALAN_PLATFORMSUPPORT_EXPORT XalanLocator : public
XERCES_CPP_NAMESPACE_QUALIFIER Locator
{
public:
+ typedef XERCES_CPP_NAMESPACE_QUALIFIER Locator ParentType;
+
#if XERCES_VERSION_MAJOR >= 2
typedef XMLSSize_t size_type;
#else
@@ -108,6 +114,10 @@
operator=(const XalanLocator&);
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +8 -0 xml-xalan/c/src/PlatformSupport/XalanNamespace.hpp
Index: XalanNamespace.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/XalanNamespace.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XalanNamespace.hpp 11 Oct 2002 01:56:09 -0000 1.1
+++ XalanNamespace.hpp 20 Nov 2002 02:27:14 -0000 1.2
@@ -68,6 +68,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XalanNamespace
{
public:
@@ -203,6 +207,10 @@
XalanDOMString m_uri;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.4 +8 -0 xml-xalan/c/src/PlatformSupport/XalanNullOutputStream.cpp
Index: XalanNullOutputStream.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/PlatformSupport/XalanNullOutputStream.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XalanNullOutputStream.cpp 26 Sep 2001 14:10:31 -0000 1.3
+++ XalanNullOutputStream.cpp 20 Nov 2002 02:27:14 -0000 1.4
@@ -59,6 +59,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XalanNullOutputStream::XalanNullOutputStream() :
XalanOutputStream(1)
{
@@ -85,3 +89,7 @@
XalanNullOutputStream::doFlush()
{
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.4 +9 -1 xml-xalan/c/src/PlatformSupport/XalanNullOutputStream.hpp
Index: XalanNullOutputStream.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/PlatformSupport/XalanNullOutputStream.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XalanNullOutputStream.hpp 26 Sep 2001 14:10:31 -0000 1.3
+++ XalanNullOutputStream.hpp 20 Nov 2002 02:27:14 -0000 1.4
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -69,6 +69,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_PLATFORMSUPPORT_EXPORT XalanNullOutputStream : public
XalanOutputStream
{
public :
@@ -101,6 +105,10 @@
bool
operator==(const XalanNullOutputStream&) const;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.12 +8 -0 xml-xalan/c/src/PlatformSupport/XalanNumberFormat.cpp
Index: XalanNumberFormat.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/XalanNumberFormat.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- XalanNumberFormat.cpp 7 Dec 2001 20:13:30 -0000 1.11
+++ XalanNumberFormat.cpp 20 Nov 2002 02:27:14 -0000 1.12
@@ -68,6 +68,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
const XalanDOMChar XalanNumberFormat::s_defaultGroupingSeparator[] =
{
XalanUnicode::charComma,
@@ -308,3 +312,7 @@
{
m_groupingSeparator = s;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.6 +9 -1 xml-xalan/c/src/PlatformSupport/XalanNumberFormat.hpp
Index: XalanNumberFormat.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/XalanNumberFormat.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XalanNumberFormat.hpp 7 Nov 2002 00:47:43 -0000 1.5
+++ XalanNumberFormat.hpp 20 Nov 2002 02:27:14 -0000 1.6
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -68,6 +68,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_PLATFORMSUPPORT_EXPORT XalanNumberFormat
{
public:
@@ -238,6 +242,10 @@
static const XalanDOMChar s_defaultGroupingSeparator[];
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.18 +8 -0 xml-xalan/c/src/PlatformSupport/XalanOutputStream.cpp
Index: XalanOutputStream.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/XalanOutputStream.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- XalanOutputStream.cpp 22 Jul 2002 22:28:55 -0000 1.17
+++ XalanOutputStream.cpp 20 Nov 2002 02:27:14 -0000 1.18
@@ -67,6 +67,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XalanOutputStream::XalanOutputStream(
BufferType::size_type theBufferSize,
TranscodeVectorType::size_type theTranscoderBlockSize,
@@ -486,3 +490,7 @@
XalanOutputStream::TranscodingException::~TranscodingException()
{
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.11 +14 -2 xml-xalan/c/src/PlatformSupport/XalanOutputStream.hpp
Index: XalanOutputStream.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/XalanOutputStream.hpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- XalanOutputStream.hpp 23 Feb 2002 04:17:46 -0000 1.10
+++ XalanOutputStream.hpp 20 Nov 2002 02:27:14 -0000 1.11
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999, 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -76,6 +76,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XalanOutputTranscoder;
@@ -87,7 +91,7 @@
enum { eDefaultBufferSize = 512, eDefaultTranscoderBlockSize = 1024 };
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
typedef vector<XalanDOMChar> BufferType;
typedef vector<char> TranscodeVectorType;
@@ -168,6 +172,8 @@
{
assert(theBuffer != 0);
+ XALAN_USING_XALAN(length)
+
write(theBuffer, length(theBuffer));
}
@@ -180,6 +186,8 @@
void
write(const XalanDOMChar* theBuffer)
{
+ XALAN_USING_XALAN(length)
+
write(theBuffer, length(theBuffer));
}
@@ -422,6 +430,10 @@
TranscodeVectorType
m_transcodingBuffer;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.10 +8 -0
xml-xalan/c/src/PlatformSupport/XalanOutputStreamPrintWriter.cpp
Index: XalanOutputStreamPrintWriter.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/PlatformSupport/XalanOutputStreamPrintWriter.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- XalanOutputStreamPrintWriter.cpp 17 May 2002 16:44:01 -0000 1.9
+++ XalanOutputStreamPrintWriter.cpp 20 Nov 2002 02:27:14 -0000 1.10
@@ -72,6 +72,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XalanOutputStreamPrintWriter::XalanOutputStreamPrintWriter(
XalanOutputStream& theOutputStream,
bool fAutoFlush) :
@@ -390,3 +394,7 @@
println();
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.5 +9 -1
xml-xalan/c/src/PlatformSupport/XalanOutputStreamPrintWriter.hpp
Index: XalanOutputStreamPrintWriter.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/PlatformSupport/XalanOutputStreamPrintWriter.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XalanOutputStreamPrintWriter.hpp 17 May 2002 16:44:01 -0000 1.4
+++ XalanOutputStreamPrintWriter.hpp 20 Nov 2002 02:27:14 -0000 1.5
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999, 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -72,6 +72,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XalanOutputStream;
@@ -211,6 +215,10 @@
XalanDOMString m_buffer;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.3 +8 -0
xml-xalan/c/src/PlatformSupport/XalanReferenceCountedObject.cpp
Index: XalanReferenceCountedObject.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/PlatformSupport/XalanReferenceCountedObject.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XalanReferenceCountedObject.cpp 5 Dec 2000 15:32:58 -0000 1.2
+++ XalanReferenceCountedObject.cpp 20 Nov 2002 02:27:14 -0000 1.3
@@ -68,6 +68,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XalanReferenceCountedObject::XalanReferenceCountedObject() :
m_referenceCount(0)
{
@@ -111,3 +115,7 @@
}
}
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.4 +9 -1
xml-xalan/c/src/PlatformSupport/XalanReferenceCountedObject.hpp
Index: XalanReferenceCountedObject.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/PlatformSupport/XalanReferenceCountedObject.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XalanReferenceCountedObject.hpp 26 Feb 2001 23:47:12 -0000 1.3
+++ XalanReferenceCountedObject.hpp 20 Nov 2002 02:27:14 -0000 1.4
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -64,6 +64,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
/**
* Class to hold reference count information.
*/
@@ -116,6 +120,10 @@
XalanReferenceCountedObject(const XalanReferenceCountedObject&);
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +12 -0
xml-xalan/c/src/PlatformSupport/XalanSimplePrefixResolver.cpp
Index: XalanSimplePrefixResolver.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/PlatformSupport/XalanSimplePrefixResolver.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XalanSimplePrefixResolver.cpp 2 Mar 2002 07:16:22 -0000 1.1
+++ XalanSimplePrefixResolver.cpp 20 Nov 2002 02:27:14 -0000 1.2
@@ -59,6 +59,14 @@
+#include <XalanDOM/XalanDOMString.hpp>
+
+
+
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XalanSimplePrefixResolver::XalanSimplePrefixResolver(
const XalanDOMString& thePrefix,
const XalanDOMString& theNamespaceURI,
@@ -97,3 +105,7 @@
{
return m_uri;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +8 -0
xml-xalan/c/src/PlatformSupport/XalanSimplePrefixResolver.hpp
Index: XalanSimplePrefixResolver.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/PlatformSupport/XalanSimplePrefixResolver.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XalanSimplePrefixResolver.hpp 2 Mar 2002 07:16:22 -0000 1.1
+++ XalanSimplePrefixResolver.hpp 20 Nov 2002 02:27:14 -0000 1.2
@@ -68,6 +68,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_PLATFORMSUPPORT_EXPORT XalanSimplePrefixResolver : public
PrefixResolver
{
public:
@@ -95,6 +99,10 @@
const XalanDOMString& m_uri;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.13 +7 -6 xml-xalan/c/src/PlatformSupport/XalanStdOutputStream.cpp
Index: XalanStdOutputStream.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/XalanStdOutputStream.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- XalanStdOutputStream.cpp 14 Nov 2002 23:55:02 -0000 1.12
+++ XalanStdOutputStream.cpp 20 Nov 2002 02:27:14 -0000 1.13
@@ -75,19 +75,16 @@
-#if !defined(XALAN_NO_NAMESPACES)
-using std::ostream;
-using std::cerr;
-#endif
+XALAN_CPP_NAMESPACE_BEGIN
-XalanStdOutputStream::XalanStdOutputStream(ostream& theOutputStream) :
+XalanStdOutputStream::XalanStdOutputStream(StreamType&
theOutputStream) :
XalanOutputStream(),
m_outputStream(theOutputStream)
{
// This will make sure that cerr is not buffered...
- if (&m_outputStream == &cerr)
+ if (&m_outputStream == &XALAN_STD_QUALIFIER cerr)
{
setBufferSize(0);
}
@@ -174,3 +171,7 @@
XalanStdOutputStream::XalanStdOutputStreamWriteException::~XalanStdOutputStreamWriteException()
{
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.12 +11 -3 xml-xalan/c/src/PlatformSupport/XalanStdOutputStream.hpp
Index: XalanStdOutputStream.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/XalanStdOutputStream.hpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- XalanStdOutputStream.hpp 14 Nov 2002 23:55:02 -0000 1.11
+++ XalanStdOutputStream.hpp 20 Nov 2002 02:27:14 -0000 1.12
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -78,12 +78,16 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
// A base class for all text output streams.
class XALAN_PLATFORMSUPPORT_EXPORT XalanStdOutputStream : public
XalanOutputStream
{
public:
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
typedef ostream StreamType;
#else
typedef std::ostream StreamType;
@@ -92,7 +96,7 @@
#if defined(XALAN_CLASSIC_IOSTREAMS)
typedef int StreamSizeType;
#else
-#if defined(XALAN_NO_NAMESPACES)
+#if defined(XALAN_NO_STD_NAMESPACE)
typedef streamsize StreamSizeType;
#else
typedef std::streamsize StreamSizeType;
@@ -141,6 +145,10 @@
// Data members...
StreamType& m_outputStream;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.8 +17 -5
xml-xalan/c/src/PlatformSupport/XalanToXercesTranscoderWrapper.cpp
Index: XalanToXercesTranscoderWrapper.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/PlatformSupport/XalanToXercesTranscoderWrapper.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XalanToXercesTranscoderWrapper.cpp 23 Feb 2002 04:17:46 -0000
1.7
+++ XalanToXercesTranscoderWrapper.cpp 20 Nov 2002 02:27:14 -0000
1.8
@@ -67,7 +67,15 @@
-XalanToXercesTranscoderWrapper::XalanToXercesTranscoderWrapper(XMLTranscoder&
theTranscoder) :
+typedef XERCES_CPP_NAMESPACE_QUALIFIER XMLException
XMLExceptionType;
+
+
+
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
+XalanToXercesTranscoderWrapper::XalanToXercesTranscoderWrapper(XMLTranscoderType&
theTranscoder) :
XalanOutputTranscoder(),
m_transcoder(&theTranscoder)
{
@@ -109,12 +117,12 @@
// $$$ ToDo: Eventually, we're going to want to
// replace this with UnRep_Throw, and let the
// caller try to recover.
-// XMLTranscoder::UnRep_Throw);
- XMLTranscoder::UnRep_RepChar);
+// XMLTranscoderType::UnRep_Throw);
+ XMLTranscoderType::UnRep_RepChar);
theSourceCharsTranscoded = theXercesSourceCharsTranscoded;
}
- catch(const XMLException&)
+ catch(const XMLExceptionType&)
{
theSourceCharsTranscoded = 0;
theTargetBytesUsed = 0;
@@ -157,7 +165,7 @@
theSourceCharsTranscoded = theXercesSourceCharsTranscoded;
theTargetBytesUsed = theXercesTargetBytesUsed;
}
- catch(const XMLException&)
+ catch(const XMLExceptionType&)
{
theSourceCharsTranscoded = 0;
theTargetBytesUsed = 0;
@@ -174,3 +182,7 @@
{
return m_transcoder->canTranscodeTo(theChar);
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.5 +15 -5
xml-xalan/c/src/PlatformSupport/XalanToXercesTranscoderWrapper.hpp
Index: XalanToXercesTranscoderWrapper.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/PlatformSupport/XalanToXercesTranscoderWrapper.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XalanToXercesTranscoderWrapper.hpp 7 Feb 2002 01:39:58 -0000
1.4
+++ XalanToXercesTranscoderWrapper.hpp 20 Nov 2002 02:27:14 -0000
1.5
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -69,7 +69,11 @@
-class XMLTranscoder;
+XALAN_DECLARE_XERCES_CLASS(XMLTranscoder)
+
+
+
+XALAN_CPP_NAMESPACE_BEGIN
@@ -77,8 +81,10 @@
{
public:
+ typedef XERCES_CPP_NAMESPACE_QUALIFIER XMLTranscoder
XMLTranscoderType;
+
explicit
- XalanToXercesTranscoderWrapper(XMLTranscoder& theTranscoder);
+ XalanToXercesTranscoderWrapper(XMLTranscoderType& theTranscoder);
virtual
~XalanToXercesTranscoderWrapper();
@@ -114,11 +120,15 @@
operator=(const XalanToXercesTranscoderWrapper&);
// A handy typedef...
- typedef unsigned int XercesSizeType;
+ typedef unsigned int XercesSizeType;
// Data members...
- XMLTranscoder* const m_transcoder;
+ XMLTranscoderType* const m_transcoder;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.18 +16 -0
xml-xalan/c/src/PlatformSupport/XalanTranscodingServices.cpp
Index: XalanTranscodingServices.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/PlatformSupport/XalanTranscodingServices.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- XalanTranscodingServices.cpp 23 Sep 2002 22:02:02 -0000 1.17
+++ XalanTranscodingServices.cpp 20 Nov 2002 02:27:14 -0000 1.18
@@ -73,6 +73,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
const XalanDOMChar XalanTranscodingServices::s_utf8String[] =
{
XalanUnicode::charLetter_U,
@@ -245,6 +249,10 @@
+
+XALAN_USING(xercesc, XMLTransService)
+
+
static XalanTranscodingServices::eCode
translateCode(XMLTransService::Codes theCode)
{
@@ -276,6 +284,8 @@
eCode& theResult,
size_t theBlockSize)
{
+ XALAN_USING(xercesc, XMLPlatformUtils)
+
assert(XMLPlatformUtils::fgTransService != 0);
XalanOutputTranscoder* theTranscoder = 0;
@@ -290,6 +300,8 @@
}
else
{
+ XALAN_USING(xercesc, XMLTranscoder)
+
XMLTranscoder* theXercesTranscoder =
XMLPlatformUtils::fgTransService->makeNewTranscoderFor(
c_wstr(theEncodingName),
@@ -483,3 +495,7 @@
XalanTranscodingServices::terminate()
{
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.13 +8 -0
xml-xalan/c/src/PlatformSupport/XalanTranscodingServices.hpp
Index: XalanTranscodingServices.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/PlatformSupport/XalanTranscodingServices.hpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- XalanTranscodingServices.hpp 23 Sep 2002 22:02:02 -0000 1.12
+++ XalanTranscodingServices.hpp 20 Nov 2002 02:27:14 -0000 1.13
@@ -75,6 +75,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XalanOutputTranscoder;
@@ -381,6 +385,10 @@
XalanOutputTranscoder&
operator=(const XalanOutputTranscoder& theRHS);
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.8 +8 -0 xml-xalan/c/src/PlatformSupport/XalanUTF16Transcoder.cpp
Index: XalanUTF16Transcoder.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/XalanUTF16Transcoder.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XalanUTF16Transcoder.cpp 18 Apr 2002 04:50:50 -0000 1.7
+++ XalanUTF16Transcoder.cpp 20 Nov 2002 02:27:14 -0000 1.8
@@ -62,6 +62,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XalanUTF16Transcoder::XalanUTF16Transcoder() :
XalanOutputTranscoder()
{
@@ -161,3 +165,7 @@
{
return true;
}
+
+
+
+XALAN_CPP_NAMESPACE_END
1.5 +9 -1 xml-xalan/c/src/PlatformSupport/XalanUTF16Transcoder.hpp
Index: XalanUTF16Transcoder.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/XalanUTF16Transcoder.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XalanUTF16Transcoder.hpp 7 Feb 2002 01:39:58 -0000 1.4
+++ XalanUTF16Transcoder.hpp 20 Nov 2002 02:27:14 -0000 1.5
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -69,6 +69,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
class XALAN_PLATFORMSUPPORT_EXPORT XalanUTF16Transcoder : public
XalanOutputTranscoder
{
public:
@@ -133,6 +137,10 @@
XalanUTF16Transcoder&
operator=(const XalanUTF16Transcoder&);
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.8 +14 -6 xml-xalan/c/src/PlatformSupport/XalanUnicode.hpp
Index: XalanUnicode.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/XalanUnicode.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XalanUnicode.hpp 11 Apr 2002 05:52:02 -0000 1.7
+++ XalanUnicode.hpp 20 Nov 2002 02:27:14 -0000 1.8
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -68,13 +68,17 @@
-#if defined(XALAN_NO_NAMESPACES)
-struct XALAN_PLATFORMSUPPORT_EXPORT XalanUnicode
-#else
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
+#if defined(XALAN_HAS_CPP_NAMESPACE)
namespace XalanUnicode
+#else
+struct XALAN_PLATFORMSUPPORT_EXPORT XalanUnicode
#endif
{
-#if defined(XALAN_NO_NAMESPACES)
+#if !defined(XALAN_HAS_CPP_NAMESPACE)
enum
{
@@ -343,7 +347,7 @@
-#if defined(XALAN_NO_NAMESPACES)
+#if !defined(XALAN_HAS_CPP_NAMESPACE)
private:
@@ -361,6 +365,10 @@
#else
}
#endif
+
+
+
+XALAN_CPP_NAMESPACE_END
1.3 +8 -0 xml-xalan/c/src/PlatformSupport/XalanXMLChar.cpp
Index: XalanXMLChar.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/XalanXMLChar.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XalanXMLChar.cpp 24 Nov 2001 01:30:38 -0000 1.2
+++ XalanXMLChar.cpp 20 Nov 2002 02:27:14 -0000 1.3
@@ -58,6 +58,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
static const char XML_XX = XalanXMLChar::XML_XX;
static const char XML_BC = XalanXMLChar::XML_BC;
static const char XML_ID = XalanXMLChar::XML_ID;
@@ -8263,3 +8267,7 @@
/* FFF0 - FFF7 */ XML_XX, XML_XX, XML_XX, XML_XX, XML_XX, XML_XX,
XML_XX, XML_XX,
/* FFF8 - FFFF */ XML_XX, XML_XX, XML_XX, XML_XX, XML_XX, XML_XX,
XML_XX, XML_XX,
};
+
+
+
+XALAN_CPP_NAMESPACE_END
1.2 +11 -1 xml-xalan/c/src/PlatformSupport/XalanXMLChar.hpp
Index: XalanXMLChar.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/XalanXMLChar.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XalanXMLChar.hpp 11 Oct 2000 19:44:44 -0000 1.1
+++ XalanXMLChar.hpp 20 Nov 2002 02:27:14 -0000 1.2
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -68,6 +68,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
struct XALAN_PLATFORMSUPPORT_EXPORT XalanXMLChar
{
@@ -130,6 +134,12 @@
};
+
+
+
+XALAN_CPP_NAMESPACE_END
+
+
#endif // XALANXMLCHAR_HEADER_GUARD_1357924680
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
