xalan-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dbert...@apache.org
Subject cvs commit: xml-xalan/c/src/DOMSupport DOMServices.cpp DOMServices.hpp DOMSupport.cpp DOMSupport.hpp DOMSupportDefault.cpp DOMSupportDefault.hpp DOMSupportDefinitions.hpp DOMSupportException.cpp DOMSupportException.hpp DOMSupportInit.cpp DOMSupportInit.hpp TreeWalker.cpp TreeWalker.hpp XalanNamespacesStack.cpp XalanNamespacesStack.hpp
Date Wed, 20 Nov 2002 02:27:26 GMT
dbertoni    2002/11/19 18:27:26

  Modified:    c/src/DOMSupport DOMServices.cpp DOMServices.hpp
                        DOMSupport.cpp DOMSupport.hpp DOMSupportDefault.cpp
                        DOMSupportDefault.hpp DOMSupportDefinitions.hpp
                        DOMSupportException.cpp DOMSupportException.hpp
                        DOMSupportInit.cpp DOMSupportInit.hpp
                        TreeWalker.cpp TreeWalker.hpp
                        XalanNamespacesStack.cpp XalanNamespacesStack.hpp
  Log:
  Updates for new C++ namespace support.
  
  Revision  Changes    Path
  1.39      +23 -13    xml-xalan/c/src/DOMSupport/DOMServices.cpp
  
  Index: DOMServices.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/DOMSupport/DOMServices.cpp,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- DOMServices.cpp	6 Oct 2002 04:04:48 -0000	1.38
  +++ DOMServices.cpp	20 Nov 2002 02:27:25 -0000	1.39
  @@ -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
  @@ -85,6 +85,8 @@
   
   
   
  +XALAN_USING_XALAN(XalanDOMString)
  +
   // These XalanDOMString instances will hold the actual
   // data.  This way, the DOMSupport references can be const,
   // but we can initialize the data when we want to.
  @@ -99,18 +101,6 @@
   
   
   
  -const XalanDOMString&	DOMServices::s_XMLString = ::s_XMLString;
  -const XalanDOMString&	DOMServices::s_XMLStringWithSeparator = ::s_XMLStringWithSeparator;
  -const XalanDOMString&	DOMServices::s_XMLNamespacePrefix = ::s_XMLNamespacePrefix;
  -const XalanDOMString&	DOMServices::s_XMLNamespaceURI = ::s_XMLNamespaceURI;
  -const XalanDOMString&	DOMServices::s_XMLNamespace = ::s_XMLNamespace;
  -const XalanDOMString&	DOMServices::s_XMLNamespaceWithSeparator = ::s_XMLNamespaceWithSeparator;
  -const XalanDOMString&	DOMServices::s_XMLNamespaceSeparatorString  = ::s_XMLNamespaceSeparatorString;
  -const XalanDOMString&	DOMServices::s_XMLNamespacePrefixURI = ::s_XMLNamespacePrefixURI;
  -const XalanDOMString	DOMServices::s_emptyString;
  -
  -
  -
   // These four unsigned ints will hold the actual
   // data.  This way, the DOMSupport references can be const,
   // but we can initialize the data when we want to.
  @@ -125,6 +115,22 @@
   
   
   
  +XALAN_CPP_NAMESPACE_BEGIN
  +
  +
  +
  +const XalanDOMString&	DOMServices::s_XMLString = ::s_XMLString;
  +const XalanDOMString&	DOMServices::s_XMLStringWithSeparator = ::s_XMLStringWithSeparator;
  +const XalanDOMString&	DOMServices::s_XMLNamespacePrefix = ::s_XMLNamespacePrefix;
  +const XalanDOMString&	DOMServices::s_XMLNamespaceURI = ::s_XMLNamespaceURI;
  +const XalanDOMString&	DOMServices::s_XMLNamespace = ::s_XMLNamespace;
  +const XalanDOMString&	DOMServices::s_XMLNamespaceWithSeparator = ::s_XMLNamespaceWithSeparator;
  +const XalanDOMString&	DOMServices::s_XMLNamespaceSeparatorString  = ::s_XMLNamespaceSeparatorString;
  +const XalanDOMString&	DOMServices::s_XMLNamespacePrefixURI = ::s_XMLNamespacePrefixURI;
  +const XalanDOMString	DOMServices::s_emptyString;
  +
  +
  +
   const XalanDOMString::size_type&	DOMServices::s_XMLStringLength = ::s_XMLStringLength;
   const XalanDOMString::size_type&	DOMServices::s_XMLStringWithSeparatorLength = ::s_XMLStringWithSeparatorLength;
   const XalanDOMString::size_type&	DOMServices::s_XMLNamespacePrefixLength = ::s_XMLNamespacePrefixLength;
  @@ -1104,3 +1110,7 @@
   
   	return parent;
   }
  +
  +
  +
  +XALAN_CPP_NAMESPACE_END
  
  
  
  1.29      +9 -1      xml-xalan/c/src/DOMSupport/DOMServices.hpp
  
  Index: DOMServices.hpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/DOMSupport/DOMServices.hpp,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- DOMServices.hpp	28 Oct 2002 23:53:10 -0000	1.28
  +++ DOMServices.hpp	20 Nov 2002 02:27:25 -0000	1.29
  @@ -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 XalanDocument;
   class XalanDocumentFragment;
   
  @@ -694,6 +698,10 @@
   		(formatterListener.*function)(c_wstr(data), FormatterListener::size_type(length(data)));
   	}
   };
  +
  +
  +
  +XALAN_CPP_NAMESPACE_END
   
   
   
  
  
  
  1.2       +10 -3     xml-xalan/c/src/DOMSupport/DOMSupport.cpp
  
  Index: DOMSupport.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/DOMSupport/DOMSupport.cpp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DOMSupport.cpp	18 Dec 1999 19:47:47 -0000	1.1
  +++ DOMSupport.cpp	20 Nov 2002 02:27:25 -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,8 +58,11 @@
   
   
   
  -DOMSupport::DOMSupport() :
  -	Resettable()
  +XALAN_CPP_NAMESPACE_BEGIN
  +
  +
  +
  +DOMSupport::DOMSupport()
   {
   }
   
  @@ -68,3 +71,7 @@
   DOMSupport::~DOMSupport()
   {
   }
  +
  +
  +
  +XALAN_CPP_NAMESPACE_END
  
  
  
  1.11      +7 -3      xml-xalan/c/src/DOMSupport/DOMSupport.hpp
  
  Index: DOMSupport.hpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/DOMSupport/DOMSupport.hpp,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- DOMSupport.hpp	10 Apr 2002 06:06:28 -0000	1.10
  +++ DOMSupport.hpp	20 Nov 2002 02:27:25 -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
  @@ -68,7 +68,7 @@
   
   
   
  -#include <PlatformSupport/Resettable.hpp>
  +XALAN_CPP_NAMESPACE_BEGIN
   
   
   
  @@ -80,7 +80,7 @@
   
   
   
  -class XALAN_DOMSUPPORT_EXPORT DOMSupport : public Resettable
  +class XALAN_DOMSUPPORT_EXPORT DOMSupport
   {
   public:
   
  @@ -121,6 +121,10 @@
   			const XalanNode&	node1,
   			const XalanNode&	node2) const = 0;
   };
  +
  +
  +
  +XALAN_CPP_NAMESPACE_END
   
   
   
  
  
  
  1.12      +9 -1      xml-xalan/c/src/DOMSupport/DOMSupportDefault.cpp
  
  Index: DOMSupportDefault.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/DOMSupport/DOMSupportDefault.cpp,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- DOMSupportDefault.cpp	10 May 2002 21:12:26 -0000	1.11
  +++ DOMSupportDefault.cpp	20 Nov 2002 02:27:25 -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,6 +78,10 @@
   
   
   
  +XALAN_CPP_NAMESPACE_BEGIN
  +
  +
  +
   DOMSupportDefault::DOMSupportDefault() :
   	DOMSupport(),
   	m_pool()
  @@ -173,3 +177,7 @@
   {
   	return DOMServices::isNodeAfter(node1, node2);
   }
  +
  +
  +
  +XALAN_CPP_NAMESPACE_END
  
  
  
  1.10      +9 -1      xml-xalan/c/src/DOMSupport/DOMSupportDefault.hpp
  
  Index: DOMSupportDefault.hpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/DOMSupport/DOMSupportDefault.hpp,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- DOMSupportDefault.hpp	10 May 2002 21:12:26 -0000	1.9
  +++ DOMSupportDefault.hpp	20 Nov 2002 02:27:25 -0000	1.10
  @@ -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_DOMSUPPORT_EXPORT DOMSupportDefault : public DOMSupport
   {
   public:
  @@ -103,6 +107,10 @@
   
   	mutable XalanDOMStringPool	m_pool;
   };
  +
  +
  +
  +XALAN_CPP_NAMESPACE_END
   
   
   
  
  
  
  1.2       +1 -1      xml-xalan/c/src/DOMSupport/DOMSupportDefinitions.hpp
  
  Index: DOMSupportDefinitions.hpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/DOMSupport/DOMSupportDefinitions.hpp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DOMSupportDefinitions.hpp	18 Dec 1999 19:47:47 -0000	1.1
  +++ DOMSupportDefinitions.hpp	20 Nov 2002 02:27:25 -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
  
  
  
  1.3       +9 -1      xml-xalan/c/src/DOMSupport/DOMSupportException.cpp
  
  Index: DOMSupportException.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/DOMSupport/DOMSupportException.cpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DOMSupportException.cpp	11 Apr 2000 14:30:44 -0000	1.2
  +++ DOMSupportException.cpp	20 Nov 2002 02:27:25 -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
  @@ -60,6 +60,10 @@
   
   
   
  +XALAN_CPP_NAMESPACE_BEGIN
  +
  +
  +
   DOMSupportException::DOMSupportException(const XalanDOMString&	message) :
   	XSLException(message)
   {
  @@ -70,3 +74,7 @@
   DOMSupportException::~DOMSupportException()
   {
   }
  +
  +
  +
  +XALAN_CPP_NAMESPACE_END
  
  
  
  1.4       +9 -1      xml-xalan/c/src/DOMSupport/DOMSupportException.hpp
  
  Index: DOMSupportException.hpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/DOMSupport/DOMSupportException.hpp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DOMSupportException.hpp	11 Apr 2000 14:30:44 -0000	1.3
  +++ DOMSupportException.hpp	20 Nov 2002 02:27:25 -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
  @@ -73,6 +73,10 @@
   
   
   
  +XALAN_CPP_NAMESPACE_BEGIN
  +
  +
  +
   class XALAN_DOMSUPPORT_EXPORT DOMSupportException : public XSLException
   {
   public:
  @@ -89,6 +93,10 @@
   
   private:
   };
  +
  +
  +
  +XALAN_CPP_NAMESPACE_END
   
   
   
  
  
  
  1.2       +9 -1      xml-xalan/c/src/DOMSupport/DOMSupportInit.cpp
  
  Index: DOMSupportInit.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/DOMSupport/DOMSupportInit.cpp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DOMSupportInit.cpp	31 Aug 2000 19:42:48 -0000	1.1
  +++ DOMSupportInit.cpp	20 Nov 2002 02:27:25 -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
  @@ -63,6 +63,10 @@
   
   
   
  +XALAN_CPP_NAMESPACE_BEGIN
  +
  +
  +
   unsigned long	DOMSupportInit::s_initCounter = 0;
   
   
  @@ -105,3 +109,7 @@
   {
   	DOMServices::terminate();
   }
  +
  +
  +
  +XALAN_CPP_NAMESPACE_END
  
  
  
  1.2       +9 -1      xml-xalan/c/src/DOMSupport/DOMSupportInit.hpp
  
  Index: DOMSupportInit.hpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/DOMSupport/DOMSupportInit.hpp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DOMSupportInit.hpp	31 Aug 2000 19:42:48 -0000	1.1
  +++ DOMSupportInit.hpp	20 Nov 2002 02:27:25 -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
  @@ -69,6 +69,10 @@
   
   
   
  +XALAN_CPP_NAMESPACE_BEGIN
  +
  +
  +
   class XALAN_DOMSUPPORT_EXPORT DOMSupportInit
   {
   public:
  @@ -97,6 +101,10 @@
   
   	static unsigned long		s_initCounter;
   };
  +
  +
  +
  +XALAN_CPP_NAMESPACE_END
   
   
   
  
  
  
  1.4       +9 -1      xml-xalan/c/src/DOMSupport/TreeWalker.cpp
  
  Index: TreeWalker.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/DOMSupport/TreeWalker.cpp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- TreeWalker.cpp	27 Nov 2001 18:48:53 -0000	1.3
  +++ TreeWalker.cpp	20 Nov 2002 02:27:25 -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
  @@ -67,6 +67,10 @@
   
   
   
  +XALAN_CPP_NAMESPACE_BEGIN
  +
  +
  +
   TreeWalker::TreeWalker()
   {
   }
  @@ -274,3 +278,7 @@
   		endNode(pos);
   	}
   }
  +
  +
  +
  +XALAN_CPP_NAMESPACE_END
  
  
  
  1.5       +9 -1      xml-xalan/c/src/DOMSupport/TreeWalker.hpp
  
  Index: TreeWalker.hpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/DOMSupport/TreeWalker.hpp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- TreeWalker.hpp	27 Nov 2001 18:48:53 -0000	1.4
  +++ TreeWalker.hpp	20 Nov 2002 02:27:25 -0000	1.5
  @@ -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 XalanNode;
   
   
  @@ -152,6 +156,10 @@
   
   private:
   };
  +
  +
  +
  +XALAN_CPP_NAMESPACE_END
   
   
   
  
  
  
  1.4       +10 -2     xml-xalan/c/src/DOMSupport/XalanNamespacesStack.cpp
  
  Index: XalanNamespacesStack.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/DOMSupport/XalanNamespacesStack.cpp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- XalanNamespacesStack.cpp	3 Nov 2002 03:29:18 -0000	1.3
  +++ XalanNamespacesStack.cpp	20 Nov 2002 02:27:25 -0000	1.4
  @@ -64,6 +64,10 @@
   
   
   
  +XALAN_CPP_NAMESPACE_BEGIN
  +
  +
  +
   XalanNamespacesStack::PrefixResolverProxy::PrefixResolverProxy(
   			const XalanNamespacesStack&		theStack,
   			const XalanDOMString&			theURI) :
  @@ -334,11 +338,11 @@
   const XalanDOMString*
   XalanNamespacesStack::getNamespaceForPrefix(const XalanDOMString&	thePrefix) const
   {
  -	if(::equals(thePrefix, DOMServices::s_XMLString))
  +	if(thePrefix == DOMServices::s_XMLString)
   	{
   		return &DOMServices::s_XMLNamespaceURI;
   	}
  -	else if (::equals(thePrefix, DOMServices::s_XMLNamespace))
  +	else if (thePrefix == DOMServices::s_XMLNamespace)
   	{
   		return &DOMServices::s_XMLNamespacePrefixURI;
   	}
  @@ -380,3 +384,7 @@
   
   	m_createNewContextStack.clear();
   }
  +
  +
  +
  +XALAN_CPP_NAMESPACE_END
  
  
  
  1.7       +11 -3     xml-xalan/c/src/DOMSupport/XalanNamespacesStack.hpp
  
  Index: XalanNamespacesStack.hpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/DOMSupport/XalanNamespacesStack.hpp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- XalanNamespacesStack.hpp	3 Nov 2002 03:29:18 -0000	1.6
  +++ XalanNamespacesStack.hpp	20 Nov 2002 02:27:25 -0000	1.7
  @@ -69,12 +69,16 @@
   
   
   
  -#include <XalanDOM/XalanDOMString.hpp>
  +#include <PlatformSupport/PrefixResolver.hpp>
  +#include <PlatformSupport/XalanNamespace.hpp>
   
   
   
  -#include <PlatformSupport/PrefixResolver.hpp>
  -#include <PlatformSupport/XalanNamespace.hpp>
  +XALAN_CPP_NAMESPACE_BEGIN
  +
  +
  +
  +class XalanDOMString;
   
   
   
  @@ -419,6 +423,10 @@
   
   	BoolVectorType					m_createNewContextStack;
   };
  +
  +
  +
  +XALAN_CPP_NAMESPACE_END
   
   
   
  
  
  

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


Mime
View raw message