Add support for custom allocators

New example: examples/cxx/hybrid/allocator.

10 files changed, 224 insertions, 18 deletions

diff --git a/libxsde/xsde/cxx/parser/non-validating/base64-binary.cxx b/libxsde/xsde/cxx/parser/non-validating/base64-binary.cxx
index f84d2a4..fb90768 100644
--- a/libxsde/xsde/cxx/parser/non-validating/base64-binary.cxx
+++ b/libxsde/xsde/cxx/parser/non-validating/base64-binary.cxx
@@ -5,6 +5,10 @@
 
 #include <xsde/cxx/config.hxx>
 
+#ifdef XSDE_CUSTOM_ALLOCATOR
+#  include <xsde/cxx/allocator.hxx>
+#endif
+
 #include <xsde/cxx/parser/non-validating/base64-binary.hxx>
 
 static unsigned char
@@ -34,11 +38,18 @@ namespace xsde
     {
       namespace non_validating
       {
-                base64_binary_pimpl::
+        base64_binary_pimpl::
         ~base64_binary_pimpl ()
         {
-          if (!base_)
+          if (!base_ && buf_)
+          {
+#ifndef XSDE_CUSTOM_ALLOCATOR
             delete buf_;
+#else
+            buf_->~buffer ();
+            cxx::free (buf_);
+#endif
+          }
         }
 
         void base64_binary_pimpl::
@@ -46,9 +57,14 @@ namespace xsde
         {
           base64_binary_pskel::_reset ();
 
-          if (!base_)
+          if (!base_ && buf_)
           {
+#ifndef XSDE_CUSTOM_ALLOCATOR
             delete buf_;
+#else
+            buf_->~buffer ();
+            cxx::free (buf_);
+#endif
             buf_ = 0;
           }
         }
@@ -70,7 +86,20 @@ namespace xsde
         {
           if (buf_ == 0)
           {
+#ifndef XSDE_CUSTOM_ALLOCATOR
             buf_ = new buffer ();
+#else
+            buf_ = static_cast<buffer*> (alloc (sizeof (buffer)));
+
+#ifdef XSDE_EXCEPTIONS
+            alloc_guard ag (buf_);
+            new (buf_) buffer ();
+            ag.release ();
+#else
+            if (buf_)
+              new (buf_) buffer ();
+#endif
+#endif
 
 #ifndef XSDE_EXCEPTIONS
             if (buf_ == 0)
diff --git a/libxsde/xsde/cxx/parser/non-validating/hex-binary.cxx b/libxsde/xsde/cxx/parser/non-validating/hex-binary.cxx
index 530315e..83c578b 100644
--- a/libxsde/xsde/cxx/parser/non-validating/hex-binary.cxx
+++ b/libxsde/xsde/cxx/parser/non-validating/hex-binary.cxx
@@ -5,6 +5,10 @@
 
 #include <xsde/cxx/config.hxx>
 
+#ifdef XSDE_CUSTOM_ALLOCATOR
+#  include <xsde/cxx/allocator.hxx>
+#endif
+
 #include <xsde/cxx/parser/non-validating/hex-binary.hxx>
 
 static unsigned char
@@ -33,8 +37,15 @@ namespace xsde
         hex_binary_pimpl::
         ~hex_binary_pimpl ()
         {
-          if (!base_)
+          if (!base_ && buf_)
+          {
+#ifndef XSDE_CUSTOM_ALLOCATOR
             delete buf_;
+#else
+            buf_->~buffer ();
+            cxx::free (buf_);
+#endif
+          }
         }
 
         void hex_binary_pimpl::
@@ -42,9 +53,14 @@ namespace xsde
         {
           hex_binary_pskel::_reset ();
 
-          if (!base_)
+          if (!base_ && buf_)
           {
+#ifndef XSDE_CUSTOM_ALLOCATOR
             delete buf_;
+#else
+            buf_->~buffer ();
+            cxx::free (buf_);
+#endif
             buf_ = 0;
           }
         }
@@ -66,7 +82,20 @@ namespace xsde
         {
           if (buf_ == 0)
           {
+#ifndef XSDE_CUSTOM_ALLOCATOR
             buf_ = new buffer ();
+#else
+            buf_ = static_cast<buffer*> (alloc (sizeof (buffer)));
+
+#ifdef XSDE_EXCEPTIONS
+            alloc_guard ag (buf_);
+            new (buf_) buffer ();
+            ag.release ();
+#else
+            if (buf_)
+              new (buf_) buffer ();
+#endif
+#endif
 
 #ifndef XSDE_EXCEPTIONS
             if (buf_ == 0)
diff --git a/libxsde/xsde/cxx/parser/non-validating/id-stl.cxx b/libxsde/xsde/cxx/parser/non-validating/id-stl.cxx
index 6c49ecf..2e5ebd7 100644
--- a/libxsde/xsde/cxx/parser/non-validating/id-stl.cxx
+++ b/libxsde/xsde/cxx/parser/non-validating/id-stl.cxx
@@ -47,4 +47,3 @@ namespace xsde
     }
   }
 }
-
diff --git a/libxsde/xsde/cxx/parser/non-validating/idrefs-stl.cxx b/libxsde/xsde/cxx/parser/non-validating/idrefs-stl.cxx
index 7c2b30d..6ae0245 100644
--- a/libxsde/xsde/cxx/parser/non-validating/idrefs-stl.cxx
+++ b/libxsde/xsde/cxx/parser/non-validating/idrefs-stl.cxx
@@ -7,6 +7,10 @@
 
 #include <xsde/cxx/config.hxx>
 
+#ifdef XSDE_CUSTOM_ALLOCATOR
+#  include <xsde/cxx/allocator.hxx>
+#endif
+
 #include <xsde/cxx/parser/non-validating/idrefs-stl.hxx>
 
 namespace xsde
@@ -20,8 +24,15 @@ namespace xsde
         idrefs_pimpl::
         ~idrefs_pimpl ()
         {
-          if (!base_)
+          if (!base_ && seq_)
+          {
+#ifndef XSDE_CUSTOM_ALLOCATOR
             delete seq_;
+#else
+            seq_->~string_sequence ();
+            cxx::free (seq_);
+#endif
+          }
         }
 
         void idrefs_pimpl::
@@ -29,9 +40,14 @@ namespace xsde
         {
           idrefs_pskel::_reset ();
 
-          if (!base_)
+          if (!base_ && seq_)
           {
+#ifndef XSDE_CUSTOM_ALLOCATOR
             delete seq_;
+#else
+            seq_->~string_sequence ();
+            cxx::free (seq_);
+#endif
             seq_ = 0;
           }
 
@@ -55,7 +71,21 @@ namespace xsde
         {
           if (seq_ == 0)
           {
+#ifndef XSDE_CUSTOM_ALLOCATOR
             seq_ = new string_sequence ();
+#else
+            seq_ = static_cast<string_sequence*> (
+              alloc (sizeof (string_sequence)));
+
+#ifdef XSDE_EXCEPTIONS
+            alloc_guard ag (seq_);
+            new (seq_) string_sequence ();
+            ag.release ();
+#else
+            if (seq_)
+              new () string_sequence ();
+#endif
+#endif
 
 #ifndef XSDE_EXCEPTIONS
             if (seq_ == 0)
diff --git a/libxsde/xsde/cxx/parser/non-validating/idrefs.cxx b/libxsde/xsde/cxx/parser/non-validating/idrefs.cxx
index d9e2794..b559c81 100644
--- a/libxsde/xsde/cxx/parser/non-validating/idrefs.cxx
+++ b/libxsde/xsde/cxx/parser/non-validating/idrefs.cxx
@@ -7,6 +7,10 @@
 
 #include <xsde/cxx/config.hxx>
 
+#ifdef XSDE_CUSTOM_ALLOCATOR
+#  include <xsde/cxx/allocator.hxx>
+#endif
+
 #include <xsde/cxx/parser/non-validating/idrefs.hxx>
 
 namespace xsde
@@ -20,8 +24,15 @@ namespace xsde
         idrefs_pimpl::
         ~idrefs_pimpl ()
         {
-          if (!base_)
+          if (!base_ && seq_)
+          {
+#ifndef XSDE_CUSTOM_ALLOCATOR
             delete seq_;
+#else
+            seq_->~string_sequence ();
+            cxx::free (seq_);
+#endif
+          }
         }
 
         void idrefs_pimpl::
@@ -29,9 +40,14 @@ namespace xsde
         {
           idrefs_pskel::_reset ();
 
-          if (!base_)
+          if (!base_ && seq_)
           {
+#ifndef XSDE_CUSTOM_ALLOCATOR
             delete seq_;
+#else
+            seq_->~string_sequence ();
+            cxx::free (seq_);
+#endif
             seq_ = 0;
           }
 
@@ -55,7 +71,21 @@ namespace xsde
         {
           if (seq_ == 0)
           {
+#ifndef XSDE_CUSTOM_ALLOCATOR
             seq_ = new string_sequence ();
+#else
+            seq_ = static_cast<string_sequence*> (
+              alloc (sizeof (string_sequence)));
+
+#ifdef XSDE_EXCEPTIONS
+            alloc_guard ag (seq_);
+            new (seq_) string_sequence ();
+            ag.release ();
+#else
+            if (seq_)
+              new () string_sequence ();
+#endif
+#endif
 
 #ifndef XSDE_EXCEPTIONS
             if (seq_ == 0)
diff --git a/libxsde/xsde/cxx/parser/non-validating/ncname-stl.cxx b/libxsde/xsde/cxx/parser/non-validating/ncname-stl.cxx
index f0b5202..0ab155e 100644
--- a/libxsde/xsde/cxx/parser/non-validating/ncname-stl.cxx
+++ b/libxsde/xsde/cxx/parser/non-validating/ncname-stl.cxx
@@ -47,4 +47,3 @@ namespace xsde
     }
   }
 }
-
diff --git a/libxsde/xsde/cxx/parser/non-validating/nmtokens-stl.cxx b/libxsde/xsde/cxx/parser/non-validating/nmtokens-stl.cxx
index 07d1945..93aefce 100644
--- a/libxsde/xsde/cxx/parser/non-validating/nmtokens-stl.cxx
+++ b/libxsde/xsde/cxx/parser/non-validating/nmtokens-stl.cxx
@@ -5,6 +5,10 @@
 
 #include <xsde/cxx/config.hxx>
 
+#ifdef XSDE_CUSTOM_ALLOCATOR
+#  include <xsde/cxx/allocator.hxx>
+#endif
+
 #include <xsde/cxx/parser/non-validating/nmtokens-stl.hxx>
 
 namespace xsde
@@ -18,8 +22,15 @@ namespace xsde
         nmtokens_pimpl::
         ~nmtokens_pimpl ()
         {
-          if (!base_)
+          if (!base_ && seq_)
+          {
+#ifndef XSDE_CUSTOM_ALLOCATOR
             delete seq_;
+#else
+            seq_->~string_sequence ();
+            cxx::free (seq_);
+#endif
+          }
         }
 
         void nmtokens_pimpl::
@@ -27,9 +38,14 @@ namespace xsde
         {
           nmtokens_pskel::_reset ();
 
-          if (!base_)
+          if (!base_ && seq_)
           {
+#ifndef XSDE_CUSTOM_ALLOCATOR
             delete seq_;
+#else
+            seq_->~string_sequence ();
+            cxx::free (seq_);
+#endif
             seq_ = 0;
           }
 
@@ -53,7 +69,21 @@ namespace xsde
         {
           if (seq_ == 0)
           {
+#ifndef XSDE_CUSTOM_ALLOCATOR
             seq_ = new string_sequence ();
+#else
+            seq_ = static_cast<string_sequence*> (
+              alloc (sizeof (string_sequence)));
+
+#ifdef XSDE_EXCEPTIONS
+            alloc_guard ag (seq_);
+            new (seq_) string_sequence ();
+            ag.release ();
+#else
+            if (seq_)
+              new () string_sequence ();
+#endif
+#endif
 
 #ifndef XSDE_EXCEPTIONS
             if (seq_ == 0)
diff --git a/libxsde/xsde/cxx/parser/non-validating/nmtokens.cxx b/libxsde/xsde/cxx/parser/non-validating/nmtokens.cxx
index 15a6254..c798b88 100644
--- a/libxsde/xsde/cxx/parser/non-validating/nmtokens.cxx
+++ b/libxsde/xsde/cxx/parser/non-validating/nmtokens.cxx
@@ -5,6 +5,10 @@
 
 #include <xsde/cxx/config.hxx>
 
+#ifdef XSDE_CUSTOM_ALLOCATOR
+#  include <xsde/cxx/allocator.hxx>
+#endif
+
 #include <xsde/cxx/parser/non-validating/nmtokens.hxx>
 
 namespace xsde
@@ -18,8 +22,15 @@ namespace xsde
         nmtokens_pimpl::
         ~nmtokens_pimpl ()
         {
-          if (!base_)
+          if (!base_ && seq_)
+          {
+#ifndef XSDE_CUSTOM_ALLOCATOR
             delete seq_;
+#else
+            seq_->~string_sequence ();
+            cxx::free (seq_);
+#endif
+          }
         }
 
         void nmtokens_pimpl::
@@ -27,9 +38,14 @@ namespace xsde
         {
           nmtokens_pskel::_reset ();
 
-          if (!base_)
+          if (!base_ && seq_)
           {
+#ifndef XSDE_CUSTOM_ALLOCATOR
             delete seq_;
+#else
+            seq_->~string_sequence ();
+            cxx::free (seq_);
+#endif
             seq_ = 0;
           }
 
@@ -53,7 +69,21 @@ namespace xsde
         {
           if (seq_ == 0)
           {
+#ifndef XSDE_CUSTOM_ALLOCATOR
             seq_ = new string_sequence ();
+#else
+            seq_ = static_cast<string_sequence*> (
+              alloc (sizeof (string_sequence)));
+
+#ifdef XSDE_EXCEPTIONS
+            alloc_guard ag (seq_);
+            new (seq_) string_sequence ();
+            ag.release ();
+#else
+            if (seq_)
+              new () string_sequence ();
+#endif
+#endif
 
 #ifndef XSDE_EXCEPTIONS
             if (seq_ == 0)
diff --git a/libxsde/xsde/cxx/parser/non-validating/qname.cxx b/libxsde/xsde/cxx/parser/non-validating/qname.cxx
index 9be5872..7d9f71d 100644
--- a/libxsde/xsde/cxx/parser/non-validating/qname.cxx
+++ b/libxsde/xsde/cxx/parser/non-validating/qname.cxx
@@ -6,6 +6,10 @@
 #include <xsde/cxx/config.hxx>
 #include <xsde/cxx/string.hxx>
 
+#ifdef XSDE_CUSTOM_ALLOCATOR
+#  include <xsde/cxx/allocator.hxx>
+#endif
+
 #include <xsde/cxx/parser/non-validating/qname.hxx>
 
 namespace xsde
@@ -19,8 +23,15 @@ namespace xsde
         qname_pimpl::
         ~qname_pimpl ()
         {
-          if (!base_)
+          if (!base_ && qn_)
+          {
+#ifndef XSDE_CUSTOM_ALLOCATOR
             delete qn_;
+#else
+            qn_->~qname ();
+            cxx::free (qn_);
+#endif
+          }
         }
 
         void qname_pimpl::
@@ -28,9 +39,14 @@ namespace xsde
         {
           qname_pskel::_reset ();
 
-          if (!base_)
+          if (!base_ && qn_)
           {
+#ifndef XSDE_CUSTOM_ALLOCATOR
             delete qn_;
+#else
+            qn_->~qname ();
+            cxx::free (qn_);
+#endif
             qn_ = 0;
           }
         }
@@ -52,7 +68,20 @@ namespace xsde
         {
           if (qn_ == 0)
           {
+#ifndef XSDE_CUSTOM_ALLOCATOR
             qn_ = new qname ();
+#else
+            qn_ = static_cast<qname*> (alloc (sizeof (qname)));
+
+#ifdef XSDE_EXCEPTIONS
+            alloc_guard ag (qn_);
+            new (qn_) qname ();
+            ag.release ();
+#else
+            if (qn_)
+              new (qn_) qname ();
+#endif
+#endif
 
 #ifndef XSDE_EXCEPTIONS
             if (qn_ == 0)
diff --git a/libxsde/xsde/cxx/parser/non-validating/xml-schema-pskel.hxx b/libxsde/xsde/cxx/parser/non-validating/xml-schema-pskel.hxx
index 5f28434..59469c6 100644
--- a/libxsde/xsde/cxx/parser/non-validating/xml-schema-pskel.hxx
+++ b/libxsde/xsde/cxx/parser/non-validating/xml-schema-pskel.hxx
@@ -548,7 +548,8 @@ namespace xsde
 
 
         // String-based types. If STL is disabled you are getting a C
-        // string that you have to delete with delete[].
+        // string that you have to delete with delete[] (or custom
+        // deallocator if enabled).
         //
         struct string_pskel: simple_content
         {