From 3d5f5564f66cb5ddadf6486e5b5ea46d2c6c373a Mon Sep 17 00:00:00 2001
From: James David Berry <jberry@apache.org>
Date: Tue, 26 Aug 2003 21:55:02 +0000
Subject: [PATCH] Add new memory allocator that allocates using new[], for use
where returned memory must be able to be deleted using delete []. This saves
duplicated code in cases where a routine is optionally called with a specific
memory manager, such as in the case of transcode
git-svn-id: https://svn.apache.org/repos/asf/xerces/c/trunk@175171 13f79535-47bb-0310-9956-ffa450edef68
---
.../internal/MemoryManagerArrayImpl.cpp | 89 +++++++++++
.../internal/MemoryManagerArrayImpl.hpp | 140 ++++++++++++++++++
2 files changed, 229 insertions(+)
create mode 100644 src/xercesc/internal/MemoryManagerArrayImpl.cpp
create mode 100644 src/xercesc/internal/MemoryManagerArrayImpl.hpp
diff --git a/src/xercesc/internal/MemoryManagerArrayImpl.cpp b/src/xercesc/internal/MemoryManagerArrayImpl.cpp
new file mode 100644
index 000000000..3817b0d89
--- /dev/null
+++ b/src/xercesc/internal/MemoryManagerArrayImpl.cpp
@@ -0,0 +1,89 @@
+/*
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2003 The Apache Software Foundation. All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The end-user documentation included with the redistribution,
+ * if any, must include the following acknowledgment:
+ * "This product includes software developed by the
+ * Apache Software Foundation (http://www.apache.org/)."
+ * Alternately, this acknowledgment may appear in the software itself,
+ * if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "Xerces" and "Apache Software Foundation" must
+ * not be used to endorse or promote products derived from this
+ * software without prior written permission. For written
+ * permission, please contact apache\@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache",
+ * nor may "Apache" appear in their name, without prior written
+ * permission of the Apache Software Foundation.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation, and was
+ * originally based on software copyright (c) 1999, International
+ * Business Machines, Inc., http://www.ibm.com . For more information
+ * on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ */
+
+/*
+ * $Log$
+ * Revision 1.1 2003/08/26 21:55:02 jberry
+ * Add new memory allocator that allocates using new[], for use where returned memory must be able to be deleted using delete []. This saves duplicated code in cases where a routine is optionally called with a specific memory manager, such as in the case of transcode
+ *
+ * Revision 1.1 2003/04/21 16:20:41 knoaman
+ * Initial check-in.
+ *
+ */
+
+
+// ---------------------------------------------------------------------------
+// Includes
+// ---------------------------------------------------------------------------
+#include <xercesc/internal/MemoryManagerArrayImpl.hpp>
+
+
+XERCES_CPP_NAMESPACE_BEGIN
+
+void* MemoryManagerArrayImpl::allocate(size_t size)
+{
+ //return ::operator new[](size);
+ return new char[size];
+}
+
+void MemoryManagerArrayImpl::deallocate(void* p)
+{
+ //::operator delete[](p);
+ delete[]p;
+}
+
+XERCES_CPP_NAMESPACE_END
+
diff --git a/src/xercesc/internal/MemoryManagerArrayImpl.hpp b/src/xercesc/internal/MemoryManagerArrayImpl.hpp
new file mode 100644
index 000000000..8745a46fd
--- /dev/null
+++ b/src/xercesc/internal/MemoryManagerArrayImpl.hpp
@@ -0,0 +1,140 @@
+/*
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2003 The Apache Software Foundation. All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The end-user documentation included with the redistribution,
+ * if any, must include the following acknowledgment:
+ * "This product includes software developed by the
+ * Apache Software Foundation (http://www.apache.org/)."
+ * Alternately, this acknowledgment may appear in the software itself,
+ * if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "Xerces" and "Apache Software Foundation" must
+ * not be used to endorse or promote products derived from this
+ * software without prior written permission. For written
+ * permission, please contact apache\@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache",
+ * nor may "Apache" appear in their name, without prior written
+ * permission of the Apache Software Foundation.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation, and was
+ * originally based on software copyright (c) 1999, International
+ * Business Machines, Inc., http://www.ibm.com . For more information
+ * on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ */
+
+/*
+ * $Id$
+ */
+
+
+#if !defined(MEMORYMANAGERARRAYIMPL_HPP)
+#define MEMORYMANAGERARRAYIMPL_HPP
+
+#include <xercesc/framework/MemoryManager.hpp>
+
+XERCES_CPP_NAMESPACE_BEGIN
+
+/**
+ * Configurable memory manager
+ *
+ * <p>This is specialized version of a Xerces
+ * memory manager, which allocates memory using
+ * using new[](size) syntax. Such memory may
+ * legally be deleted with delete[].
+ * </p>
+ * <p>This version is used in special cases where it is desired
+ * that allocated memory be able to be delete[]d.
+ * </p>
+ */
+
+class XMLUTIL_EXPORT MemoryManagerArrayImpl : public MemoryManager
+{
+public:
+
+ /** @name Constructor */
+ //@{
+
+ /**
+ * Default constructor
+ */
+ MemoryManagerArrayImpl()
+ {
+ }
+ //@}
+
+ /** @name Destructor */
+ //@{
+
+ /**
+ * Default destructor
+ */
+ virtual ~MemoryManagerArrayImpl()
+ {
+ }
+ //@}
+
+ /** @name The virtual methods in MemoryManager */
+ //@{
+
+ /**
+ * This method allocates requested memory.
+ *
+ * @param size The requested memory size
+ *
+ * @return A pointer to the allocated memory
+ */
+ virtual void* allocate(size_t size);
+
+ /**
+ * This method deallocates memory
+ *
+ * @param p The pointer to the allocated memory to be deleted
+ */
+ virtual void deallocate(void* p);
+
+ //@}
+
+private:
+ // -----------------------------------------------------------------------
+ // Unimplemented constructors and operators
+ // -----------------------------------------------------------------------
+ MemoryManagerArrayImpl(const MemoryManagerArrayImpl&);
+ MemoryManagerArrayImpl& operator=(const MemoryManagerArrayImpl&);
+
+};
+
+XERCES_CPP_NAMESPACE_END
+
+#endif
--
GitLab